reorg: mv oxml.parts.styles => oxml.styles

Steve Canny · Steve Canny · commit c8f7620e90aa · 2015-02-08T00:01:39.000-08:00
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
@@ -86,11 +86,6 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('w:numbering',     CT_Numbering)
 register_element_cls('w:startOverride', CT_DecimalNumber)
 
-from .parts.styles import CT_Style, CT_Styles
-register_element_cls('w:name',   CT_String)
-register_element_cls('w:style',  CT_Style)
-register_element_cls('w:styles', CT_Styles)
-
 from .section import CT_PageMar, CT_PageSz, CT_SectPr, CT_SectType
 register_element_cls('w:pgMar',  CT_PageMar)
 register_element_cls('w:pgSz',   CT_PageSz)
@@ -118,6 +113,11 @@ def OxmlElement(nsptag_str, attrs=None, nsdecls=None):
 register_element_cls('wp:extent',     CT_PositiveSize2D)
 register_element_cls('wp:inline',     CT_Inline)
 
+from .styles import CT_Style, CT_Styles
+register_element_cls('w:name',   CT_String)
+register_element_cls('w:style',  CT_Style)
+register_element_cls('w:styles', CT_Styles)
+
 from .table import (
     CT_Row, CT_Tbl, CT_TblGrid, CT_TblGridCol, CT_TblLayoutType, CT_TblPr,
     CT_TblWidth, CT_Tc, CT_TcPr, CT_VMerge
diff --git a/docx/oxml/styles.py b/docx/oxml/styles.py
@@ -4,9 +4,9 @@
 Custom element classes related to the styles part
 """
 
-from ...enum.style import WD_STYLE_TYPE
-from ..simpletypes import ST_OnOff, ST_String
-from ..xmlchemy import (
+from ..enum.style import WD_STYLE_TYPE
+from .simpletypes import ST_OnOff, ST_String
+from .xmlchemy import (
     BaseOxmlElement, OptionalAttribute, ZeroOrMore, ZeroOrOne
 )
 
diff --git a/tests/parts/test_styles.py b/tests/parts/test_styles.py
@@ -10,7 +10,7 @@
 
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.package import OpcPackage
-from docx.oxml.parts.styles import CT_Styles
+from docx.oxml.styles import CT_Styles
 from docx.parts.styles import StylesPart
 from docx.styles.styles import Styles
 
diff --git a/tests/styles/test_styles.py b/tests/styles/test_styles.py
@@ -11,7 +11,7 @@
 import pytest
 
 from docx.enum.style import WD_STYLE_TYPE
-from docx.oxml.parts.styles import CT_Style, CT_Styles
+from docx.oxml.styles import CT_Style, CT_Styles
 from docx.styles.style import BaseStyle
 from docx.styles.styles import Styles
 
