Merge pull request #138 from viper-framework/py3

More fixes on relative imports (py3)

Merge pull request #138 from viper-framework/py3
More fixes on relative imports (py3)
Philippe Lagadec · GitHub
2 parents 879c3fb4 edb7ecec
Showing 11 changed files with 34 additions and 34 deletions
oletools/ezhexviewer.py
oletools/mraptor.py
oletools/mraptor3.py
oletools/olebrowse.py
oletools/olemap.py
oletools/olemeta.py
oletools/oleobj.py
oletools/oletimes.py
oletools/olevba.py
oletools/pyxswf.py
oletools/rtfobj.py
@@ -54,7 +54,7 @@ __version__ = &#39;0.50&#39;
 # + options to set title and msg
-from thirdparty.easygui import easygui
+from .thirdparty.easygui import easygui
 import sys
 # === PYTHON 2+3 SUPPORT ======================================================
@@ -154,4 +154,4 @@ def main():
 if __name__ == '__main__':
-    main()
 \ No newline at end of file
+    main()
@@ -66,8 +66,8 @@ __version__ = &#39;0.51&#39;
 import sys, logging, optparse, re
-from thirdparty.xglob import xglob
-from thirdparty.tablestream import tablestream
+from .thirdparty.xglob import xglob
+from .thirdparty.tablestream import tablestream
 import olevba
@@ -63,13 +63,13 @@ __version__ = &#39;0.50py3&#39;
 import sys, logging, optparse, re
-from thirdparty.xglob import xglob
+from .thirdparty.xglob import xglob
 # import the python 3 version of tablestream:
-from thirdparty.tablestream import tablestream
+from .thirdparty.tablestream import tablestream
 # import the python 3 version of olevba
-import olevba3 as olevba
+from . import olevba3 as olevba
 # === LOGGING =================================================================
@@ -52,9 +52,9 @@ __version__ = &#39;0.02&#39;
 # - stream info: magic, entropy, ... ?
 import optparse, sys, os
-from thirdparty.easygui import easygui
-import thirdparty.olefile as olefile
-import ezhexviewer
+from .thirdparty.easygui import easygui
+from .thirdparty import olefile
+from . import ezhexviewer
 ABOUT = '~ About olebrowse'
 QUIT  = '~ Quit'
@@ -52,8 +52,8 @@ __version__ = &#39;0.50&#39;
 # === IMPORTS ================================================================
 import sys
-from thirdparty.olefile import olefile
-from thirdparty.tablestream import tablestream
+from .thirdparty.olefile import olefile
+from .thirdparty.tablestream import tablestream
@@ -60,8 +60,8 @@ __version__ = &#39;0.50&#39;
 #=== IMPORTS =================================================================
 import sys, codecs
-import thirdparty.olefile as olefile
-from thirdparty.tablestream import tablestream
+import .thirdparty import olefile
+from .thirdparty.tablestream import tablestream
 #=== MAIN =================================================================
@@ -117,4 +117,4 @@ def main():
     ole.close()
 if __name__ == '__main__':
-    main()
 \ No newline at end of file
+    main()
@@ -70,8 +70,8 @@ __version__ = &#39;0.51&#39;
 import logging, struct, optparse, os, re, sys
-from thirdparty.olefile import olefile
-from thirdparty.xglob import xglob
+from .thirdparty.olefile import olefile
+from .thirdparty.xglob import xglob
 # === LOGGING =================================================================
@@ -61,8 +61,8 @@ __version__ = &#39;0.50&#39;
 #=== IMPORTS =================================================================
 import sys, datetime
-import thirdparty.olefile as olefile
-from thirdparty.prettytable import prettytable
+from .thirdparty import olefile
+from .thirdparty.prettytable import prettytable
 # === MAIN ===================================================================
@@ -256,15 +256,16 @@ except ImportError:
                                + "see http://codespeak.net/lxml " \
                                + "or http://effbot.org/zone/element-index.htm")
-import thirdparty.olefile as olefile
-from thirdparty.prettytable import prettytable
-from thirdparty.xglob import xglob, PathNotFoundException
-from thirdparty.pyparsing.pyparsing import \
+from .thirdparty import olefile
+from .thirdparty.prettytable import prettytable
+from .thirdparty.xglob import xglob, PathNotFoundException
+from .thirdparty.pyparsing.pyparsing import \
         CaselessKeyword, CaselessLiteral, Combine, Forward, Literal, \
         Optional, QuotedString,Regex, Suppress, Word, WordStart, \
         alphanums, alphas, hexnums,nums, opAssoc, srange, \
         infixNotation, ParserElement
-import ppt_parser
+from . import ppt_parser
+
 # monkeypatch email to fix issue #32:
 # allow header lines without ":"
@@ -1886,7 +1887,7 @@ def detect_dridex_strings(vba_code):
     :param vba_code: str, VBA source code
     :return: list of str tuples (encoded string, decoded string)
     """
-    from thirdparty.DridexUrlDecoder.DridexUrlDecoder import DridexUrlDecode
+    from .thirdparty.DridexUrlDecoder.DridexUrlDecoder import DridexUrlDecode
     results = []
     found = set()
@@ -74,10 +74,11 @@ __version__ = &#39;0.50&#39;
 #=== IMPORTS =================================================================
-import optparse, sys, os, rtfobj
+import optparse, sys, os
+from . import rtfobj
 from io import BytesIO
-from thirdparty.xxxswf import xxxswf
-import thirdparty.olefile as olefile
+from .thirdparty.xxxswf import xxxswf
+from .thirdparty import olefile
 #=== MAIN =================================================================
@@ -83,12 +83,10 @@ __version__ = &#39;0.51&#39;
 import re, os, sys, binascii, logging, optparse
 import os.path
-from thirdparty.xglob import xglob
-from oleobj import OleObject, OleNativeStream
-import oleobj
-
-from thirdparty.tablestream import tablestream
-
+from .thirdparty.xglob import xglob
+from .thirdparty.tablestream import tablestream
+from .oleobj import OleObject, OleNativeStream
+from . import oleobj
 # === LOGGING =================================================================