oxml: convert CT_GraphicalObjectData to xmlchemy

Steve Canny · Steve Canny · commit 0087e2dc2f34 · 2014-06-16T02:17:33.000-07:00
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
@@ -7,9 +7,10 @@
 from . import OxmlElement
 from ..shared import Emu
 from .ns import nsmap, nspfxmap, qn
-from .simpletypes import ST_RelationshipId
+from .simpletypes import ST_RelationshipId, XsdToken
 from .xmlchemy import (
-    BaseOxmlElement, OneAndOnlyOne, OptionalAttribute, ZeroOrOne
+    BaseOxmlElement, OneAndOnlyOne, OptionalAttribute, RequiredAttribute,
+    ZeroOrOne
 )
 
 
@@ -61,21 +62,16 @@ class CT_GraphicalObjectData(BaseOxmlElement):
     """
     ``<a:graphicData>`` element, container for the XML of a DrawingML object
     """
+    pic = ZeroOrOne('pic:pic')
+    uri = RequiredAttribute('uri', XsdToken)
+
     @classmethod
     def new(cls, uri, pic):
         graphicData = OxmlElement('a:graphicData')
-        graphicData.set('uri', uri)
-        graphicData.append(pic)
+        graphicData.uri = uri
+        graphicData._insert_pic(pic)
         return graphicData
 
-    @property
-    def pic(self):
-        return self.find(qn('pic:pic'))
-
-    @property
-    def uri(self):
-        return self.get('uri')
-
 
 class CT_Inline(BaseOxmlElement):
     """
