[Libreoffice-commits] mso-dumper.git: 3 commits - compress.py decompress.py doc-dump.py msodumper/docdirstream.py msodumper/docrecord.py msodumper/docsprm.py msodumper/docstream.py msodumper/formula.py msodumper/globals.py msodumper/__init__.py msodumper/msocrypto.py msodumper/msodraw.py msodumper/node.py msodumper/ole.py msodumper/olestream.py msodumper/oletool.py msodumper/pptrecord.py msodumper/pptstream.py msodumper/vbahelper.py msodumper/xlsmodel.py msodumper/xlsparser.py msodumper/xlsrecord.py msodumper/xlsstream.py msodumper/xmlpp.py ppt-dump.py src/docdirstream.py src/docrecord.py src/docsprm.py src/docstream.py src/formula.py src/globals.py src/msocrypto.py src/msodraw.py src/node.py src/ole.py src/olestream.py src/oletool.py src/pptrecord.py src/pptstream.py src/vbahelper.py src/xlsmodel.py src/xlsparser.py src/xlsrecord.py src/xlsstream.py src/xmlpp.py test/doc vbadump.py xls-dump.py

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 27 00:27:11 PST 2013


 compress.py               |    4 
 decompress.py             |    4 
 doc-dump.py               |    5 
 msodumper/docdirstream.py |  183 +
 msodumper/docrecord.py    | 3701 +++++++++++++++++++++++++++++++
 msodumper/docsprm.py      |  353 +++
 msodumper/docstream.py    |  991 ++++++++
 msodumper/formula.py      |  727 ++++++
 msodumper/globals.py      |  479 ++++
 msodumper/msocrypto.py    |   77 
 msodumper/msodraw.py      | 1318 +++++++++++
 msodumper/node.py         |  219 +
 msodumper/ole.py          |  938 ++++++++
 msodumper/olestream.py    |  220 +
 msodumper/oletool.py      |   65 
 msodumper/pptrecord.py    | 1721 ++++++++++++++
 msodumper/pptstream.py    |  442 +++
 msodumper/vbahelper.py    |  280 ++
 msodumper/xlsmodel.py     |  639 +++++
 msodumper/xlsparser.py    |  753 ++++++
 msodumper/xlsrecord.py    | 5380 ++++++++++++++++++++++++++++++++++++++++++++++
 msodumper/xlsstream.py    |  550 ++++
 msodumper/xmlpp.py        |  149 +
 ppt-dump.py               |    6 
 src/docdirstream.py       |  183 -
 src/docrecord.py          | 3701 -------------------------------
 src/docsprm.py            |  353 ---
 src/docstream.py          |  991 --------
 src/formula.py            |  727 ------
 src/globals.py            |  479 ----
 src/msocrypto.py          |   77 
 src/msodraw.py            | 1318 -----------
 src/node.py               |  219 -
 src/ole.py                |  938 --------
 src/olestream.py          |  220 -
 src/oletool.py            |   65 
 src/pptrecord.py          | 1721 --------------
 src/pptstream.py          |  442 ---
 src/vbahelper.py          |  280 --
 src/xlsmodel.py           |  639 -----
 src/xlsparser.py          |  753 ------
 src/xlsrecord.py          | 5380 ----------------------------------------------
 src/xlsstream.py          |  550 ----
 src/xmlpp.py              |  149 -
 test/doc/test.py          |    1 
 vbadump.py                |    4 
 xls-dump.py               |    9 
 47 files changed, 19199 insertions(+), 19204 deletions(-)

New commits:
commit a88102b95a18f61ef0ada3b7f3a9ad3c921a56e0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Nov 27 09:26:18 2013 +0100

    test/doc/test.py: remove one more reference to renamed src/

diff --git a/test/doc/test.py b/test/doc/test.py
index 03eb87e..b6c4d36 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -8,7 +8,6 @@
 
 import sys
 sys.path.append(sys.path[0]+"/../..")
-sys.path.append(sys.path[0]+"/../../src")
 doc_dumper = __import__('doc-dump')
 from xml.etree import ElementTree
 import unittest
commit 27a98c7aa1bc287f6a576e7dabaa62db1a194b68
Author: Jean-Francois Dockes <jf at dockes.org>
Date:   Tue Nov 26 13:20:19 2013 +0100

    More import statement changes after src -> msodumper

diff --git a/compress.py b/compress.py
index 7ab4a9a..72a0ad8 100755
--- a/compress.py
+++ b/compress.py
@@ -27,8 +27,8 @@
 ########################################################################
 
 import sys, os.path, optparse
-sys.path.append(sys.path[0]+"/src")
-import vbahelper
+
+from msodumper import vbahelper
 
 def main():
 
diff --git a/decompress.py b/decompress.py
index 50e7401..5b4b0fb 100755
--- a/decompress.py
+++ b/decompress.py
@@ -27,8 +27,8 @@
 ########################################################################
 
 import sys, os.path, optparse
-sys.path.append(sys.path[0]+"/src")
-import vbahelper
+
+from msodumper import vbahelper
 
 def main():
 
diff --git a/vbadump.py b/vbadump.py
index b8b2aa2..2c930ec 100755
--- a/vbadump.py
+++ b/vbadump.py
@@ -27,8 +27,8 @@
 ########################################################################
 
 import sys, os.path, optparse, math
-sys.path.append(sys.path[0]+"/src")
-import ole, globals, node, olestream, vbahelper
+
+from msodumper import ole, globals, node, olestream, vbahelper
 
 #codepage -> codepagename map
 # note: there are some missing entries ( the commented out ones ) that
commit 16c3cf3535919c8eb16973f216baf342ae0dee51
Author: Jean-Francois Dockes <jf at dockes.org>
Date:   Tue Nov 26 13:08:03 2013 +0100

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

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
diff --git a/src/docdirstream.py b/msodumper/docdirstream.py
similarity index 100%
rename from src/docdirstream.py
rename to msodumper/docdirstream.py
diff --git a/src/docrecord.py b/msodumper/docrecord.py
similarity index 100%
rename from src/docrecord.py
rename to msodumper/docrecord.py
diff --git a/src/docsprm.py b/msodumper/docsprm.py
similarity index 100%
rename from src/docsprm.py
rename to msodumper/docsprm.py
diff --git a/src/docstream.py b/msodumper/docstream.py
similarity index 100%
rename from src/docstream.py
rename to msodumper/docstream.py
diff --git a/src/formula.py b/msodumper/formula.py
similarity index 100%
rename from src/formula.py
rename to msodumper/formula.py
diff --git a/src/globals.py b/msodumper/globals.py
similarity index 100%
rename from src/globals.py
rename to msodumper/globals.py
diff --git a/src/msocrypto.py b/msodumper/msocrypto.py
similarity index 100%
rename from src/msocrypto.py
rename to msodumper/msocrypto.py
diff --git a/src/msodraw.py b/msodumper/msodraw.py
similarity index 100%
rename from src/msodraw.py
rename to msodumper/msodraw.py
diff --git a/src/node.py b/msodumper/node.py
similarity index 100%
rename from src/node.py
rename to msodumper/node.py
diff --git a/src/ole.py b/msodumper/ole.py
similarity index 100%
rename from src/ole.py
rename to msodumper/ole.py
diff --git a/src/olestream.py b/msodumper/olestream.py
similarity index 100%
rename from src/olestream.py
rename to msodumper/olestream.py
diff --git a/src/oletool.py b/msodumper/oletool.py
similarity index 100%
rename from src/oletool.py
rename to msodumper/oletool.py
diff --git a/src/pptrecord.py b/msodumper/pptrecord.py
similarity index 100%
rename from src/pptrecord.py
rename to msodumper/pptrecord.py
diff --git a/src/pptstream.py b/msodumper/pptstream.py
similarity index 100%
rename from src/pptstream.py
rename to msodumper/pptstream.py
diff --git a/src/vbahelper.py b/msodumper/vbahelper.py
similarity index 100%
rename from src/vbahelper.py
rename to msodumper/vbahelper.py
diff --git a/src/xlsmodel.py b/msodumper/xlsmodel.py
similarity index 100%
rename from src/xlsmodel.py
rename to msodumper/xlsmodel.py
diff --git a/src/xlsparser.py b/msodumper/xlsparser.py
similarity index 100%
rename from src/xlsparser.py
rename to msodumper/xlsparser.py
diff --git a/src/xlsrecord.py b/msodumper/xlsrecord.py
similarity index 100%
rename from src/xlsrecord.py
rename to msodumper/xlsrecord.py
diff --git a/src/xlsstream.py b/msodumper/xlsstream.py
similarity index 100%
rename from src/xlsstream.py
rename to msodumper/xlsstream.py
diff --git a/src/xmlpp.py b/msodumper/xmlpp.py
similarity index 100%
rename from src/xmlpp.py
rename to 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):


More information about the Libreoffice-commits mailing list