cleanup

eupharis · eupharis · commit 67ae998f71d5 · 2015-12-03T10:35:48.000-08:00
diff --git a/docx/__init__.py b/docx/__init__.py
@@ -8,10 +8,11 @@
 # register custom Part classes with opc package reader
 
 from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
-from docx.opc.part import PartFactory, XmlPart
+from docx.opc.part import PartFactory
 from docx.opc.parts.coreprops import CorePropertiesPart
 
 from docx.parts.document import DocumentPart
+from docx.parts.header import HeaderPart, FooterPart
 from docx.parts.image import ImagePart
 from docx.parts.numbering import NumberingPart
 from docx.parts.styles import StylesPart
@@ -28,8 +29,8 @@ def part_class_selector(content_type, reltype):
 PartFactory.part_type_for[CT.WML_DOCUMENT_MAIN] = DocumentPart
 PartFactory.part_type_for[CT.WML_NUMBERING] = NumberingPart
 PartFactory.part_type_for[CT.WML_STYLES] = StylesPart
-PartFactory.part_type_for[CT.WML_HEADER] = XmlPart
-PartFactory.part_type_for[CT.WML_FOOTER] = XmlPart
+PartFactory.part_type_for[CT.WML_HEADER] = HeaderPart
+PartFactory.part_type_for[CT.WML_FOOTER] = FooterPart
 
 del (
     CT, CorePropertiesPart, DocumentPart, NumberingPart, PartFactory,
diff --git a/docx/oxml/section.py b/docx/oxml/section.py
@@ -13,12 +13,6 @@
 from .xmlchemy import BaseOxmlElement, OptionalAttribute, ZeroOrOne
 
 
-class CT_HeaderReference(BaseOxmlElement):
-    """
-    ``<w:headerReference>``, the element for the header reference
-    """
-
-
 class CT_PageMar(BaseOxmlElement):
     """
     ``<w:pgMar>`` element, defining page margins.
diff --git a/docx/parts/header.py b/docx/parts/header.py
@@ -7,17 +7,24 @@
 
 
 class HeaderPart(XmlPart):
-    # COPYPASTA FROM DOCUMENT PART BELOW THIS POINT
-    # TODO ABSTRACT?
-
-    # @lazyproperty
-    # def inline_shapes(self):
-        # """
-        # The |InlineShapes| instance containing the inline shapes in the
-        # document.
-        # """
-        # return InlineShapes(self._element.body, self)
+    @property
+    def _styles_part(self):
+        """
+        Instance of |StylesPart| for this document. Creates an empty styles
+        part if one is not present.
+        """
+        # HACK
+        # one styles to rule them all, maybe this is the way it's supposed to be?
+        document = self.package.main_document_part
+        try:
+            return document.part_related_by(RT.STYLES)
+        except KeyError:
+            styles_part = StylesPart.default(self.package)
+            document.relate_to(styles_part, RT.STYLES)
+            return styles_part
 
+    # MOSTLY COPYPASTA FROM DOCUMENT PART BELOW THIS POINT
+    # TODO ABSTRACT?
     @property
     def next_id(self):
         """
@@ -90,23 +97,7 @@ def styles(self):
         """
         return self._styles_part.styles
 
-    @property
-    def _styles_part(self):
-        """
-        Instance of |StylesPart| for this document. Creates an empty styles
-        part if one is not present.
-        """
-        # HACK
-        # one styles to rule them all
-        document = self.package.main_document_part
-        try:
-            return document.part_related_by(RT.STYLES)
-        except KeyError:
-            styles_part = StylesPart.default(self.package)
-            document.relate_to(styles_part, RT.STYLES)
-            return styles_part
-
 
 class FooterPart(HeaderPart):
-    # identical to HeaderPart for now
+    # identical to HeaderPart, ABSTRACT
     pass
