oxml: extract nsmap to docx.oxml.ns

Steve Canny · Steve Canny · commit f64f87be6726 · 2014-06-15T02:02:32.000-07:00
diff --git a/docx/oxml/ns.py b/docx/oxml/ns.py
@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+"""
+Namespace-related objects.
+"""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+
+nsmap = {
+    'a':   ('http://schemas.openxmlformats.org/drawingml/2006/main'),
+    'c':   ('http://schemas.openxmlformats.org/drawingml/2006/chart'),
+    'dgm': ('http://schemas.openxmlformats.org/drawingml/2006/diagram'),
+    'pic': ('http://schemas.openxmlformats.org/drawingml/2006/picture'),
+    'r':   ('http://schemas.openxmlformats.org/officeDocument/2006/relations'
+            'hips'),
+    'w':   ('http://schemas.openxmlformats.org/wordprocessingml/2006/main'),
+    'wp':  ('http://schemas.openxmlformats.org/drawingml/2006/wordprocessing'
+            'Drawing'),
+    'xml': ('http://www.w3.org/XML/1998/namespace')
+}
diff --git a/docx/oxml/parts/numbering.py b/docx/oxml/parts/numbering.py
@@ -4,9 +4,8 @@
 Custom element classes related to the numbering part
 """
 
-from docx.oxml.shared import (
-    CT_DecimalNumber, nsmap, OxmlBaseElement, OxmlElement, qn
-)
+from ..shared import CT_DecimalNumber, OxmlBaseElement, OxmlElement, qn
+from ..ns import nsmap
 
 
 class CT_Num(OxmlBaseElement):
diff --git a/docx/oxml/parts/styles.py b/docx/oxml/parts/styles.py
@@ -4,7 +4,8 @@
 Custom element classes related to the styles part
 """
 
-from docx.oxml.shared import nsmap, OxmlBaseElement, qn
+from ..shared import OxmlBaseElement, qn
+from ..ns import nsmap
 
 
 class CT_Style(OxmlBaseElement):
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
@@ -4,10 +4,9 @@
 Custom element classes for shape-related elements like ``<w:inline>``
 """
 
-from docx.oxml.shared import (
-    nsmap, nspfxmap, OxmlBaseElement, OxmlElement, qn
-)
-from docx.shared import Emu
+from .shared import nspfxmap, OxmlBaseElement, OxmlElement, qn
+from ..shared import Emu
+from .ns import nsmap
 
 
 class CT_Blip(OxmlBaseElement):
diff --git a/docx/oxml/shared.py b/docx/oxml/shared.py
@@ -9,21 +9,9 @@
 import re
 
 from .exceptions import ValidationError
+from .ns import nsmap
 
 
-nsmap = {
-    'a':   ('http://schemas.openxmlformats.org/drawingml/2006/main'),
-    'c':   ('http://schemas.openxmlformats.org/drawingml/2006/chart'),
-    'dgm': ('http://schemas.openxmlformats.org/drawingml/2006/diagram'),
-    'pic': ('http://schemas.openxmlformats.org/drawingml/2006/picture'),
-    'r':   ('http://schemas.openxmlformats.org/officeDocument/2006/relations'
-            'hips'),
-    'w':   ('http://schemas.openxmlformats.org/wordprocessingml/2006/main'),
-    'wp':  ('http://schemas.openxmlformats.org/drawingml/2006/wordprocessing'
-            'Drawing'),
-    'xml': ('http://www.w3.org/XML/1998/namespace')
-}
-
 # configure XML parser
 element_class_lookup = etree.ElementNamespaceClassLookup()
 oxml_parser = etree.XMLParser(remove_blank_text=True)
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -11,7 +11,8 @@
 from ..opc.constants import RELATIONSHIP_TYPE as RT
 from ..opc.oxml import serialize_part_xml
 from ..opc.package import Part
-from ..oxml.shared import nsmap, oxml_fromstring
+from ..oxml.ns import nsmap
+from ..oxml.shared import oxml_fromstring
 from ..shape import InlineShape
 from ..shared import lazyproperty, Parented
 from ..table import Table
diff --git a/docx/shape.py b/docx/shape.py
@@ -9,9 +9,9 @@
     absolute_import, division, print_function, unicode_literals
 )
 
-from docx.enum.shape import WD_INLINE_SHAPE
-from docx.oxml.shape import CT_Inline, CT_Picture
-from docx.oxml.shared import nsmap
+from .enum.shape import WD_INLINE_SHAPE
+from .oxml.shape import CT_Inline, CT_Picture
+from .oxml.ns import nsmap
 
 
 class InlineShape(object):
