reorg: mv oxml.parts.document oxml.document

Steve Canny · Steve Canny · commit 154f1436dfc3 · 2015-02-15T14:18:04.000-08:00
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
@@ -67,13 +67,13 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 from .shared import CT_DecimalNumber, CT_OnOff, CT_String
 
 
-from .parts.coreprops import CT_CoreProperties
-register_element_cls('cp:coreProperties', CT_CoreProperties)
-
-from .parts.document import CT_Body, CT_Document
+from .document import CT_Body, CT_Document
 register_element_cls('w:body',     CT_Body)
 register_element_cls('w:document', CT_Document)
 
+from .parts.coreprops import CT_CoreProperties
+register_element_cls('cp:coreProperties', CT_CoreProperties)
+
 from .parts.numbering import (
     CT_Num, CT_Numbering, CT_NumLvl, CT_NumPr
 )
diff --git a/docx/oxml/document.py b/docx/oxml/document.py
@@ -5,8 +5,8 @@
 <w:document>.
 """
 
-from ..table import CT_Tbl
-from ..xmlchemy import BaseOxmlElement, ZeroOrOne, ZeroOrMore
+from .table import CT_Tbl
+from .xmlchemy import BaseOxmlElement, ZeroOrOne, ZeroOrMore
 
 
 class CT_Document(BaseOxmlElement):
diff --git a/tests/test_shape.py b/tests/test_shape.py
@@ -9,8 +9,8 @@
 import pytest
 
 from docx.enum.shape import WD_INLINE_SHAPE
+from docx.oxml.document import CT_Body
 from docx.oxml.ns import nsmap
-from docx.oxml.parts.document import CT_Body
 from docx.oxml.text.run import CT_R
 from docx.parts.document import DocumentPart
 from docx.parts.image import ImagePart
