diff options
| -rw-r--r-- | mammoth/docx/__init__.py (renamed from mammoth/docx.py) | 4 | ||||
| -rw-r--r-- | mammoth/docx/xmlparser.py (renamed from mammoth/xmlparser.py) | 0 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | tests/docx/__init__.py | 0 | ||||
| -rw-r--r-- | tests/docx/docx_tests.py (renamed from tests/docx_tests.py) | 4 | ||||
| -rw-r--r-- | tests/docx/xmlparser_tests.py (renamed from tests/xmlparser_tests.py) | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/mammoth/docx.py b/mammoth/docx/__init__.py index 01087ce..de2b8a8 100644 --- a/mammoth/docx.py +++ b/mammoth/docx/__init__.py @@ -1,7 +1,7 @@ import zipfile -from . import documents -from .results import Result +from .. import documents +from ..results import Result from .xmlparser import parse_xml, node_types diff --git a/mammoth/xmlparser.py b/mammoth/docx/xmlparser.py index d58ea75..d58ea75 100644 --- a/mammoth/xmlparser.py +++ b/mammoth/docx/xmlparser.py @@ -14,7 +14,7 @@ setup( author='Michael Williamson', author_email='mike@zwobble.org', url='http://github.com/mwilliamson/python-mammoth', - packages=['mammoth'], + packages=['mammoth', 'mammoth.docx'], keywords="docx word office clean html", ) diff --git a/tests/docx/__init__.py b/tests/docx/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/docx/__init__.py diff --git a/tests/docx_tests.py b/tests/docx/docx_tests.py index 792ff14..9e9efe2 100644 --- a/tests/docx_tests.py +++ b/tests/docx/docx_tests.py @@ -1,8 +1,8 @@ from nose.tools import istest, assert_equal from mammoth import docx, documents -from mammoth.xmlparser import element as xml_element, text as xml_text -from .testing import test_path +from mammoth.docx.xmlparser import element as xml_element, text as xml_text +from ..testing import test_path @istest class ReadTests(object): diff --git a/tests/xmlparser_tests.py b/tests/docx/xmlparser_tests.py index 33563dd..5e33778 100644 --- a/tests/xmlparser_tests.py +++ b/tests/docx/xmlparser_tests.py @@ -2,7 +2,7 @@ import io from nose.tools import istest, assert_equal -from mammoth.xmlparser import parse_xml, element as xml_element, text as xml_text +from mammoth.docx.xmlparser import parse_xml, element as xml_element, text as xml_text @istest |