modify import to package oletools

Sébastien Larinier
1 parent 1af6975e
Showing 3 changed files with 12 additions and 12 deletions
oletools/olevba3.py
oletools/ppt_parser.py
setup.py
@@ -244,15 +244,15 @@ 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 \
+import oletools.thirdparty.olefile as olefile
+from oletools.thirdparty.prettytable import prettytable
+from oletools.thirdparty.xglob import xglob, PathNotFoundException
+from oletools.thirdparty.pyparsing.pyparsing import \
         CaselessKeyword, CaselessLiteral, Combine, Forward, Literal, \
         Optional, QuotedString,Regex, Suppress, Word, WordStart, \
         alphanums, alphas, hexnums,nums, opAssoc, srange, \
         infixNotation
-import ppt_parser
+import oletools.ppt_parser as ppt_parser
  
 # monkeypatch email to fix issue #32:
 # allow header lines without ":"
@@ -1814,7 +1814,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 oletools.thirdparty.DridexUrlDecoder.DridexUrlDecoder import DridexUrlDecode
  
     results = []
     found = set()
@@ -37,7 +37,7 @@ import struct
 import traceback
 import os
  
-import thirdparty.olefile as olefile
+import oletools.thirdparty.olefile as olefile
 import zlib
  
  
@@ -285,11 +285,11 @@ entry_points = {
 def main():
     # TODO: remove this test once all tools are ported to Python 3
     # TODO: warning about Python 2.6
-    if sys.version >= '3.0':
-        s = "Sorry, %s %s requires Python 2.x."
-        print(s % (name, version))
-        sys.exit(1)
-##    if sys.version < required_python_version:
+#     if sys.version >= '3.0':
+#         s = "Sorry, %s %s requires Python 2.x."
+#         print(s % (name, version))
+#         sys.exit(1)
+# ##    if sys.version < required_python_version:
 ##        s = "I'm sorry, but %s %s requires Python %s or later."
 ##        print(s % (name, version, required_python_version))
 ##        sys.exit(1)