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

Steve Canny · Steve Canny · commit 337734f67d4d · 2014-06-15T02:32:04.000-07:00
diff --git a/docx/oxml/ns.py b/docx/oxml/ns.py
@@ -70,3 +70,11 @@ def nsuri(self):
         'http://foo/bar' in nsmap.
         """
         return self._ns_uri
+
+
+def nsdecls(*prefixes):
+    """
+    Return a string containing a namespace declaration for each of the
+    namespace prefix strings, e.g. 'p', 'ct', passed as *prefixes*.
+    """
+    return ' '.join(['xmlns:%s="%s"' % (pfx, nsmap[pfx]) for pfx in prefixes])
diff --git a/docx/oxml/shared.py b/docx/oxml/shared.py
@@ -20,10 +20,6 @@
 # ===========================================================================
 
 
-def nsdecls(*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
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -5,10 +5,11 @@
 (CT_R).
 """
 
-from docx.enum.text import WD_UNDERLINE
-from docx.oxml.parts.numbering import CT_NumPr
-from docx.oxml.shared import (
-    CT_String, nsdecls, OxmlBaseElement, OxmlElement, oxml_fromstring, qn
+from ..enum.text import WD_UNDERLINE
+from .ns import nsdecls
+from .parts.numbering import CT_NumPr
+from .shared import (
+    CT_String, OxmlBaseElement, OxmlElement, oxml_fromstring, qn
 )
 
 
diff --git a/tests/unitdata.py b/tests/unitdata.py
@@ -6,7 +6,8 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-from docx.oxml.shared import nsdecls, oxml_fromstring
+from docx.oxml.ns import nsdecls
+from docx.oxml.shared import oxml_fromstring
 
 
 class BaseBuilder(object):
