oxml: extract OxmlElement() to pptx.oxml

Steve Canny · Steve Canny · commit 75c0302e3ff8 · 2014-06-15T03:45:12.000-07:00
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
@@ -9,7 +9,7 @@
 
 from lxml import etree
 
-from .ns import nsmap
+from .ns import NamespacePrefixedTag, nsmap
 
 
 # configure XML parser
@@ -40,6 +40,21 @@ def register_custom_element_class(tag, cls):
     namespace[tagroot] = cls
 
 
+def OxmlElement(nsptag_str, attrs=None, nsmap=None):
+    """
+    Return a 'loose' lxml element having the tag specified by *nsptag_str*.
+    *nsptag_str* must contain the standard namespace prefix, e.g. 'a:tbl'.
+    The resulting element is an instance of the custom element class for this
+    tag name if one is defined. A dictionary of attribute values may be
+    provided as *attrs*; they are set if present.
+    """
+    nsptag = NamespacePrefixedTag(nsptag_str)
+    _nsmap = nsptag.nsmap if nsmap is None else nsmap
+    return oxml_parser.makeelement(
+        nsptag.clark_name, attrib=attrs, nsmap=_nsmap
+    )
+
+
 # ===========================================================================
 # custom element class mappings
 # ===========================================================================
diff --git a/docx/oxml/parts/numbering.py b/docx/oxml/parts/numbering.py
@@ -4,7 +4,8 @@
 Custom element classes related to the numbering part
 """
 
-from ..shared import CT_DecimalNumber, OxmlBaseElement, OxmlElement
+from .. import OxmlElement
+from ..shared import CT_DecimalNumber, OxmlBaseElement
 from ..ns import nsmap, qn
 
 
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
@@ -4,7 +4,8 @@
 Custom element classes for shape-related elements like ``<w:inline>``
 """
 
-from .shared import OxmlBaseElement, OxmlElement
+from . import OxmlElement
+from .shared import OxmlBaseElement
 from ..shared import Emu
 from .ns import nsmap, nspfxmap, qn
 
diff --git a/docx/oxml/shared.py b/docx/oxml/shared.py
@@ -10,31 +10,16 @@
 
 import re
 
-from . import oxml_parser
+from . import OxmlElement
 from .exceptions import ValidationError
-from .ns import NamespacePrefixedTag, qn
+from .ns import qn
 
 
 # ===========================================================================
 # utility functions
 # ===========================================================================
 
 
-def OxmlElement(nsptag_str, attrs=None, nsmap=None):
-    """
-    Return a 'loose' lxml element having the tag specified by *nsptag_str*.
-    *nsptag_str* must contain the standard namespace prefix, e.g. 'a:tbl'.
-    The resulting element is an instance of the custom element class for this
-    tag name if one is defined. A dictionary of attribute values may be
-    provided as *attrs*; they are set if present.
-    """
-    nsptag = NamespacePrefixedTag(nsptag_str)
-    _nsmap = nsptag.nsmap if nsmap is None else nsmap
-    return oxml_parser.makeelement(
-        nsptag.clark_name, attrib=attrs, nsmap=_nsmap
-    )
-
-
 def serialize_for_reading(element):
     """
     Serialize *element* to human-readable XML suitable for tests. No XML
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
@@ -6,9 +6,10 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+from . import OxmlElement
 from .exceptions import ValidationError
 from .ns import qn
-from .shared import CT_String, OxmlBaseElement, OxmlElement
+from .shared import CT_String, OxmlBaseElement
 from .text import CT_P
 
 
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -5,11 +5,11 @@
 (CT_R).
 """
 
-from . import parse_xml
+from . import parse_xml, OxmlElement
 from ..enum.text import WD_UNDERLINE
 from .ns import nsdecls, qn
 from .parts.numbering import CT_NumPr
-from .shared import CT_String, OxmlBaseElement, OxmlElement
+from .shared import CT_String, OxmlBaseElement
 
 
 class CT_Br(OxmlBaseElement):
diff --git a/docx/package.py b/docx/package.py
@@ -110,6 +110,6 @@ def image_partname(n):
             return PackURI('/word/media/image%d.%s' % (n, ext))
         used_numbers = [image_part.partname.idx for image_part in self]
         for n in range(1, len(self)+1):
-            if not n in used_numbers:
+            if n not in used_numbers:
                 return image_partname(n)
         return image_partname(len(self)+1)
