Merge pull request nolze#63 from nolze/fix/use-absolute-imports

Use absolute imports

msoffcrypto/__init__.py

@@ -2,7 +2,7 @@
 import zipfile
 import pkg_resources
 
-from . import exceptions
+from msoffcrypto import exceptions
 
 __version__ = pkg_resources.get_distribution("msoffcrypto-tool").version
 
@@ -46,7 +46,7 @@ def OfficeFile(file):
  if olefile.isOleFile(file):
  ole = olefile.OleFileIO(file)
  elif zipfile.is_zipfile(file): # Heuristic
- from .format.ooxml import OOXMLFile
+ from msoffcrypto.format.ooxml import OOXMLFile
 
  return OOXMLFile(file)
  else:
@@ -55,25 +55,25 @@ def OfficeFile(file):
  # TODO: Make format specifiable by option in case of obstruction
  # Try this first; see https://github.com/nolze/msoffcrypto-tool/issues/17
  if ole.exists("EncryptionInfo"):
- from .format.ooxml import OOXMLFile
+ from msoffcrypto.format.ooxml import OOXMLFile
 
  return OOXMLFile(file)
  # MS-DOC: The WordDocument stream MUST be present in the file.
  # https://msdn.microsoft.com/en-us/library/dd926131(v=office.12).aspx
  elif ole.exists("wordDocument"):
- from .format.doc97 import Doc97File
+ from msoffcrypto.format.doc97 import Doc97File
 
  return Doc97File(file)
  # MS-XLS: A file MUST contain exactly one Workbook Stream, ...
  # https://msdn.microsoft.com/en-us/library/dd911009(v=office.12).aspx
  elif ole.exists("Workbook"):
- from .format.xls97 import Xls97File
+ from msoffcrypto.format.xls97 import Xls97File
 
  return Xls97File(file)
  # MS-PPT: A required stream whose name MUST be "PowerPoint Document".
  # https://docs.microsoft.com/en-us/openspecs/office_file_formats/ms-ppt/1fc22d56-28f9-4818-bd45-67c2bf721ccf
  elif ole.exists("PowerPoint Document"):
- from .format.ppt97 import Ppt97File
+ from msoffcrypto.format.ppt97 import Ppt97File
 
  return Ppt97File(file)
  else:

msoffcrypto/__main__.py

@@ -5,9 +5,9 @@
 
 import olefile
 
-from . import __version__
-from . import OfficeFile
-from . import exceptions
+from msoffcrypto import __version__
+from msoffcrypto import OfficeFile
+from msoffcrypto import exceptions
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())

msoffcrypto/format/doc97.py

@@ -4,11 +4,11 @@
 
 import olefile
 
-from .. import exceptions
-from . import base
-from .common import _parse_encryptionheader, _parse_encryptionverifier
-from ..method.rc4 import DocumentRC4
-from ..method.rc4_cryptoapi import DocumentRC4CryptoAPI
+from msoffcrypto import exceptions
+from msoffcrypto.format import base
+from msoffcrypto.format.common import _parse_encryptionheader, _parse_encryptionverifier
+from msoffcrypto.method.rc4 import DocumentRC4
+from msoffcrypto.method.rc4_cryptoapi import DocumentRC4CryptoAPI
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())

msoffcrypto/format/ooxml.py

@@ -6,11 +6,11 @@
 
 import olefile
 
-from .. import exceptions
-from . import base
-from .common import _parse_encryptionheader, _parse_encryptionverifier
-from ..method.ecma376_agile import ECMA376Agile
-from ..method.ecma376_standard import ECMA376Standard
+from msoffcrypto import exceptions
+from msoffcrypto.format import base
+from msoffcrypto.format.common import _parse_encryptionheader, _parse_encryptionverifier
+from msoffcrypto.method.ecma376_agile import ECMA376Agile
+from msoffcrypto.method.ecma376_standard import ECMA376Standard
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())

msoffcrypto/format/ppt97.py

@@ -4,10 +4,10 @@
 
 import olefile
 
-from .. import exceptions
-from . import base
-from .common import _parse_encryptionheader, _parse_encryptionverifier
-from ..method.rc4_cryptoapi import DocumentRC4CryptoAPI
+from msoffcrypto import exceptions
+from msoffcrypto.format import base
+from msoffcrypto.format.common import _parse_encryptionheader, _parse_encryptionverifier
+from msoffcrypto.method.rc4_cryptoapi import DocumentRC4CryptoAPI
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())

msoffcrypto/format/xls97.py

@@ -4,11 +4,11 @@
 
 import olefile
 
-from .. import exceptions
-from . import base
-from .common import _parse_encryptionheader, _parse_encryptionverifier
-from ..method.rc4 import DocumentRC4
-from ..method.rc4_cryptoapi import DocumentRC4CryptoAPI
+from msoffcrypto import exceptions
+from msoffcrypto.format import base
+from msoffcrypto.format.common import _parse_encryptionheader, _parse_encryptionverifier
+from msoffcrypto.method.rc4 import DocumentRC4
+from msoffcrypto.method.rc4_cryptoapi import DocumentRC4CryptoAPI
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())