reorg: mv oxml.parts.coreprops oxml.coreprops

Steve Canny · Steve Canny · commit 503259349012 · 2015-02-15T14:24:02.000-08:00
diff --git a/docx/opc/parts/coreprops.py b/docx/opc/parts/coreprops.py
@@ -12,7 +12,7 @@
 
 from ..constants import CONTENT_TYPE as CT
 from ..coreprops import CoreProperties
-from ...oxml.parts.coreprops import CT_CoreProperties
+from ...oxml.coreprops import CT_CoreProperties
 from ..packuri import PackURI
 from ..part import XmlPart
 
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 .coreprops import CT_CoreProperties
+register_element_cls('cp:coreProperties', CT_CoreProperties)
+
 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/coreprops.py b/docx/oxml/coreprops.py
@@ -12,9 +12,9 @@
 
 from datetime import datetime, timedelta
 
-from .. import parse_xml
-from ..ns import nsdecls, qn
-from ..xmlchemy import BaseOxmlElement, ZeroOrOne
+from . import parse_xml
+from .ns import nsdecls, qn
+from .xmlchemy import BaseOxmlElement, ZeroOrOne
 
 
 class CT_CoreProperties(BaseOxmlElement):
diff --git a/tests/opc/parts/test_coreprops.py b/tests/opc/parts/test_coreprops.py
@@ -14,7 +14,7 @@
 
 from docx.opc.coreprops import CoreProperties
 from docx.opc.parts.coreprops import CorePropertiesPart
-from docx.oxml.parts.coreprops import CT_CoreProperties
+from docx.oxml.coreprops import CT_CoreProperties
 
 from ...unitutil.mock import class_mock, instance_mock
 
