xmlch: fix discovered bug in OptionalAttribute

Steve Canny · Steve Canny · commit 756d17958076 · 2014-06-17T21:40:14.000-07:00
Didn’t delete optional attribute on assign None when attribute has
namespace prefix. Lookup of attribute needs to be on clark_name, not
attr_name.
diff --git a/docx/oxml/xmlchemy.py b/docx/oxml/xmlchemy.py
@@ -188,8 +188,8 @@ def _setter(self):
         """
         def set_attr_value(obj, value):
             if value is None or value == self._default:
-                if self._attr_name in obj.attrib:
-                    del obj.attrib[self._attr_name]
+                if self._clark_name in obj.attrib:
+                    del obj.attrib[self._clark_name]
                 return
             str_value = self._simple_type.to_xml(value)
             obj.set(self._clark_name, str_value)
diff --git a/tests/oxml/test_xmlchemy.py b/tests/oxml/test_xmlchemy.py
@@ -439,11 +439,14 @@ def getter_fixture(self):
         parent = a_parent().with_nsdecls().with_optAttr('24').element
         return parent, 24
 
-    @pytest.fixture
-    def setter_fixture(self):
+    @pytest.fixture(params=[36, None])
+    def setter_fixture(self, request):
+        value = request.param
         parent = a_parent().with_nsdecls().with_optAttr('42').element
-        value = 36
-        expected_xml = a_parent().with_nsdecls().with_optAttr(value).xml()
+        if value is None:
+            expected_xml = a_parent().with_nsdecls().xml()
+        else:
+            expected_xml = a_parent().with_nsdecls().with_optAttr(value).xml()
         return parent, value, expected_xml
 
 
@@ -731,7 +734,7 @@ class CT_Parent(BaseOxmlElement):
     oooChild = OneAndOnlyOne('w:oooChild')
     zomChild = ZeroOrMore('w:zomChild', successors=('w:zooChild',))
     zooChild = ZeroOrOne('w:zooChild', successors=())
-    optAttr = OptionalAttribute('optAttr', ST_IntegerType)
+    optAttr = OptionalAttribute('w:optAttr', ST_IntegerType)
     reqAttr = RequiredAttribute('reqAttr', ST_IntegerType)
 
 
@@ -785,7 +788,7 @@ class CT_Choice2Builder(BaseBuilder):
 class CT_ParentBuilder(BaseBuilder):
     __tag__ = 'w:parent'
     __nspfxs__ = ('w',)
-    __attrs__ = ('optAttr', 'reqAttr')
+    __attrs__ = ('w:optAttr', 'reqAttr')
 
 
 class CT_OomChildBuilder(BaseBuilder):
