oxml: convert CT_Picture to xmlchemy

Steve Canny · Steve Canny · commit 7f97f7b1e5ed · 2014-06-16T18:15:56.000-07:00
diff --git a/docs/dev/analysis/features/shapes-inline.rst b/docs/dev/analysis/features/shapes-inline.rst
@@ -144,15 +144,15 @@ Schema definitions
   <xsd:complexType name="CT_Inline">
     <xsd:sequence>
       <xsd:element name="extent"            type="a:CT_PositiveSize2D"/>
-      <xsd:element name="effectExtent"      type="CT_EffectExtent" minOccurs="0"/>
+      <xsd:element name="effectExtent"      type="CT_EffectExtent"                      minOccurs="0"/>
       <xsd:element name="docPr"             type="a:CT_NonVisualDrawingProps"/>
       <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties" minOccurs="0"/>
       <xsd:element name="graphic"           type="CT_GraphicalObject"/>
     </xsd:sequence>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distT" type="ST_WrapDistance"/>
+    <xsd:attribute name="distB" type="ST_WrapDistance"/>
+    <xsd:attribute name="distL" type="ST_WrapDistance"/>
+    <xsd:attribute name="distR" type="ST_WrapDistance"/>
   </xsd:complexType>
 
   <xsd:complexType name="CT_PositiveSize2D">
@@ -175,9 +175,9 @@ Schema definitions
     </xsd:sequence>
     <xsd:attribute name="id"     type="ST_DrawingElementId" use="required"/>
     <xsd:attribute name="name"   type="xsd:string"          use="required"/>
-    <xsd:attribute name="descr"  type="xsd:string"          use="optional" default=""/>
-    <xsd:attribute name="hidden" type="xsd:boolean"         use="optional" default="false"/>
-    <xsd:attribute name="title"  type="xsd:string"          use="optional" default=""/>
+    <xsd:attribute name="descr"  type="xsd:string"          default=""/>
+    <xsd:attribute name="hidden" type="xsd:boolean"         default="false"/>
+    <xsd:attribute name="title"  type="xsd:string"          default=""/>
   </xsd:complexType>
 
   <xsd:complexType name="CT_NonVisualGraphicFrameProperties">
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
@@ -105,10 +105,10 @@ class CT_NonVisualDrawingProps(BaseOxmlElement):
     """
     @classmethod
     def new(cls, nsptagname_str, shape_id, name):
-        elt = OxmlElement(nsptagname_str)
-        elt.set('id', str(shape_id))
-        elt.set('name', name)
-        return elt
+        elm = OxmlElement(nsptagname_str)
+        elm.set('id', str(shape_id))
+        elm.set('name', name)
+        return elm
 
 
 class CT_NonVisualPictureProperties(BaseOxmlElement):
@@ -125,9 +125,7 @@ class CT_Picture(BaseOxmlElement):
     """
     ``<pic:pic>`` element, a DrawingML picture
     """
-    @property
-    def blipFill(self):
-        return self.find(qn('pic:blipFill'))
+    blipFill = OneAndOnlyOne('pic:blipFill')
 
     @classmethod
     def new(cls, pic_id, filename, rId, cx, cy):
