Peter M. Groen / oletools

Commit 90e75a0b05b84cba9d4494721d28ead5fc4e0515

Authored by decalage2
1 parent 005c28ca

mraptor3: changed imports for Python 3

Inline Side-by-side
Showing 1 changed file with 8 additions and 3 deletions
oletools/mraptor3.py
  View file @90e75a0
@@ -50,8 +50,10 @@ http://www.decalage.info/python/oletools @@ -50,8 +50,10 @@ http://www.decalage.info/python/oletools
50 # 2016-02-29 v0.02 PL: - added Workbook_Activate, FileSaveAs 50 # 2016-02-29 v0.02 PL: - added Workbook_Activate, FileSaveAs
51 # 2016-03-04 v0.03 PL: - returns an exit code based on the overall result 51 # 2016-03-04 v0.03 PL: - returns an exit code based on the overall result
52 # 2016-03-08 v0.04 PL: - collapse long lines before analysis 52 # 2016-03-08 v0.04 PL: - collapse long lines before analysis
  53 +# 2016-07-19 v0.50 SL: - converted to Python 3
  54 +# 2016-08-26 PL: - changed imports for Python 3
53 55
54 -__version__ = '0.04' 56 +__version__ = '0.50py3'
55 57
56 #------------------------------------------------------------------------------ 58 #------------------------------------------------------------------------------
57 # TODO: 59 # TODO:
@@ -62,9 +64,12 @@ __version__ = '0.04' @@ -62,9 +64,12 @@ __version__ = '0.04'
62 import sys, logging, optparse, re 64 import sys, logging, optparse, re
63 65
64 from thirdparty.xglob import xglob 66 from thirdparty.xglob import xglob
65 -from thirdparty.tablestream import tablestream  
66 67
67 -import olevba 68 +# import the python 3 version of tablestream:
  69 +from thirdparty.tablestream import tablestream3 as tablestream
  70 +
  71 +# import the python 3 version of olevba
  72 +import olevba3 as olevba
68 73
69 # === LOGGING ================================================================= 74 # === LOGGING =================================================================
70 75