oxml: extract nspfxmap() to docx.oxml.ns

Steve Canny · Steve Canny · commit f4b305a9136d · 2014-06-15T02:51:06.000-07:00
Changes to OxmlElement were just to satisfy flake8, although it’s
probably a little bit better style anyway.
diff --git a/docx/oxml/ns.py b/docx/oxml/ns.py
@@ -78,3 +78,12 @@ def nsdecls(*prefixes):
     namespace prefix strings, e.g. 'p', 'ct', passed as *prefixes*.
     """
     return ' '.join(['xmlns:%s="%s"' % (pfx, nsmap[pfx]) for pfx in prefixes])
+
+
+def nspfxmap(*nspfxs):
+    """
+    Return a dict containing the subset namespace prefix mappings specified by
+    *nspfxs*. Any number of namespace prefixes can be supplied, e.g.
+    namespaces('a', 'r', 'p').
+    """
+    return dict((pfx, nsmap[pfx]) for pfx in nspfxs)
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
@@ -4,9 +4,9 @@
 Custom element classes for shape-related elements like ``<w:inline>``
 """
 
-from .shared import nspfxmap, OxmlBaseElement, OxmlElement, qn
+from .shared import OxmlBaseElement, OxmlElement, qn
 from ..shared import Emu
-from .ns import nsmap
+from .ns import nsmap, nspfxmap
 
 
 class CT_Blip(OxmlBaseElement):
diff --git a/docx/oxml/shared.py b/docx/oxml/shared.py
@@ -20,15 +20,6 @@
 # ===========================================================================
 
 
-def nspfxmap(*nspfxs):
-    """
-    Return a dict containing the subset namespace prefix mappings specified by
-    *nspfxs*. Any number of namespace prefixes can be supplied, e.g.
-    namespaces('a', 'r', 'p').
-    """
-    return dict((pfx, nsmap[pfx]) for pfx in nspfxs)
-
-
 def OxmlElement(nsptag_str, attrs=None, nsmap=None):
     """
     Return a 'loose' lxml element having the tag specified by *nsptag_str*.
@@ -38,9 +29,9 @@ def OxmlElement(nsptag_str, attrs=None, nsmap=None):
     provided as *attrs*; they are set if present.
     """
     nsptag = NamespacePrefixedTag(nsptag_str)
-    nsmap = nsmap if nsmap is not None else nsptag.nsmap
+    _nsmap = nsptag.nsmap if nsmap is None else nsmap
     return oxml_parser.makeelement(
-        nsptag.clark_name, attrib=attrs, nsmap=nsmap
+        nsptag.clark_name, attrib=attrs, nsmap=_nsmap
     )
 
 
