Renamed src directory to msodumper and handle imports in a more pythonic way

24 files changed, 8 insertions, 12 deletions

diff --git a/doc-dump.py b/doc-dump.py
index 7279a34..65152a8 100755
--- a/doc-dump.py
+++ b/doc-dump.py
@@ -8,9 +8,8 @@
 import sys
 sys = reload(sys)
 sys.setdefaultencoding("utf-8")
-sys.path.append(sys.path[0]+"/src")
-import globals
-import docstream
+
+from msodumper import globals, docstream
 
 class DOCDumper:
     def __init__(self, filepath, params):
diff --git a/msodumper/__init__.py b/msodumper/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/msodumper/__init__.py
diff --git a/src/docdirstream.py b/msodumper/docdirstream.py
index 060a520..060a520 100644
--- a/src/docdirstream.py
+++ b/msodumper/docdirstream.py
diff --git a/src/docrecord.py b/msodumper/docrecord.py
index a6e63c4..a6e63c4 100644
--- a/src/docrecord.py
+++ b/msodumper/docrecord.py
diff --git a/src/docsprm.py b/msodumper/docsprm.py
index 7924225..7924225 100644
--- a/src/docsprm.py
+++ b/msodumper/docsprm.py
diff --git a/src/docstream.py b/msodumper/docstream.py
index 7a8e995..7a8e995 100644
--- a/src/docstream.py
+++ b/msodumper/docstream.py
diff --git a/src/formula.py b/msodumper/formula.py
index 4faeb01..4faeb01 100644
--- a/src/formula.py
+++ b/msodumper/formula.py
diff --git a/src/globals.py b/msodumper/globals.py
index a3fa6a1..a3fa6a1 100644
--- a/src/globals.py
+++ b/msodumper/globals.py
diff --git a/src/msocrypto.py b/msodumper/msocrypto.py
index 541dd75..541dd75 100644
--- a/src/msocrypto.py
+++ b/msodumper/msocrypto.py
diff --git a/src/msodraw.py b/msodumper/msodraw.py
index 5c40562..5c40562 100644
--- a/src/msodraw.py
+++ b/msodumper/msodraw.py
diff --git a/src/node.py b/msodumper/node.py
index e139122..e139122 100644
--- a/src/node.py
+++ b/msodumper/node.py
diff --git a/src/ole.py b/msodumper/ole.py
index 736c6e9..736c6e9 100644
--- a/src/ole.py
+++ b/msodumper/ole.py
diff --git a/src/olestream.py b/msodumper/olestream.py
index ef458ad..ef458ad 100644
--- a/src/olestream.py
+++ b/msodumper/olestream.py
diff --git a/src/oletool.py b/msodumper/oletool.py
index 5236902..5236902 100755
--- a/src/oletool.py
+++ b/msodumper/oletool.py
diff --git a/src/pptrecord.py b/msodumper/pptrecord.py
index 51bb160..51bb160 100644
--- a/src/pptrecord.py
+++ b/msodumper/pptrecord.py
diff --git a/src/pptstream.py b/msodumper/pptstream.py
index d1ad3f1..d1ad3f1 100644
--- a/src/pptstream.py
+++ b/msodumper/pptstream.py
diff --git a/src/vbahelper.py b/msodumper/vbahelper.py
index c032d20..c032d20 100644
--- a/src/vbahelper.py
+++ b/msodumper/vbahelper.py
diff --git a/src/xlsmodel.py b/msodumper/xlsmodel.py
index bb4288a..bb4288a 100644
--- a/src/xlsmodel.py
+++ b/msodumper/xlsmodel.py
diff --git a/src/xlsparser.py b/msodumper/xlsparser.py
index 2a58285..2a58285 100644
--- a/src/xlsparser.py
+++ b/msodumper/xlsparser.py
diff --git a/src/xlsrecord.py b/msodumper/xlsrecord.py
index 3e3ebfc..3e3ebfc 100644
--- a/src/xlsrecord.py
+++ b/msodumper/xlsrecord.py
diff --git a/src/xlsstream.py b/msodumper/xlsstream.py
index d47e121..d47e121 100644
--- a/src/xlsstream.py
+++ b/msodumper/xlsstream.py
diff --git a/src/xmlpp.py b/msodumper/xmlpp.py
index 8975689..8975689 100755
--- a/src/xmlpp.py
+++ b/msodumper/xmlpp.py
diff --git a/ppt-dump.py b/ppt-dump.py
index 706b6f1..b7bcc32 100755
--- a/ppt-dump.py
+++ b/ppt-dump.py
@@ -27,10 +27,8 @@
 ########################################################################
 
 import sys, os.path, getopt
-sys.path.append(sys.path[0]+"/src")
-import ole, pptstream, globals, olestream
-
-from globals import error
+from msodumper import ole, pptstream, globals, olestream
+from msodumper.globals import error
 
 def usage (exname):
     exname = os.path.basename(exname)
diff --git a/xls-dump.py b/xls-dump.py
index c01d1e5..219430e 100755
--- a/xls-dump.py
+++ b/xls-dump.py
@@ -27,12 +27,11 @@
 ########################################################################
 
 import sys, os.path, optparse
-sys.path.append(sys.path[0]+"/src")
-import ole, xlsstream, globals, node, xlsmodel, olestream
-import xlsparser
-import msocrypto
 
-from globals import error
+from msodumper import ole, xlsstream, globals, node, xlsmodel, olestream
+from msodumper import xlsparser, msocrypto
+
+from msodumper.globals import error
 
 def equalsName (name, array):
     if len(name) != len(array):