py3: fix Python 3 compatibility on xmlchemy

Steve Canny · Steve Canny · commit 15fbe518d89b · 2014-06-17T23:23:26.000-07:00
diff --git a/docx/oxml/xmlchemy.py b/docx/oxml/xmlchemy.py
@@ -689,10 +689,12 @@ def _remove_choice_group_method_name(self):
         return '_remove_%s' % self._prop_name
 
 
-class BaseOxmlElement(etree.ElementBase):
+class _OxmlElementBase(etree.ElementBase):
     """
-    Base class for all custom element classes, to add standardized behavior
-    to all classes in one place.
+    Effective base class for all custom element classes, to add standardized
+    behavior to all classes in one place. Actual inheritance is from
+    BaseOxmlElement below, needed to manage Python 2-3 metaclass declaration
+    compatibility.
     """
 
     __metaclass__ = MetaOxmlElement
@@ -752,3 +754,8 @@ def xpath(self, xpath_str):
     @property
     def _nsptag(self):
         return NamespacePrefixedTag.from_clark_name(self.tag)
+
+
+BaseOxmlElement = MetaOxmlElement(
+    'BaseOxmlElement', (etree.ElementBase,), dict(_OxmlElementBase.__dict__)
+)
diff --git a/tests/oxml/test__init__.py b/tests/oxml/test__init__.py
@@ -31,19 +31,15 @@ def it_adds_supplied_attributes(self):
         assert etree.tostring(element) == (
             '<a:foo xmlns:a="http://schemas.openxmlformats.org/drawingml/200'
             '6/main" a="b" c="d"/>'
-        )
+        ).encode('utf-8')
 
     def it_adds_additional_namespace_declarations_when_supplied(self):
-        element = OxmlElement(
-            'a:foo', nsdecls={
-                'a': 'http://schemas.openxmlformats.org/drawingml/2006/main',
-                'x': 'other'
-            }
-        )
-        assert etree.tostring(element) == (
-            '<a:foo xmlns:a="http://schemas.openxmlformats.org/drawingml/200'
-            '6/main" xmlns:x="other"/>'
-        )
+        ns1 = 'http://schemas.openxmlformats.org/drawingml/2006/main'
+        ns2 = 'other'
+        element = OxmlElement('a:foo', nsdecls={'a': ns1, 'x': ns2})
+        assert len(element.nsmap.items()) == 2
+        assert element.nsmap['a'] == ns1
+        assert element.nsmap['x'] == ns2
 
 
 class DescribeOxmlParser(object):
