oxml: convert CT_String to xmlchemy

Steve Canny · Steve Canny · commit d49c0f511e2f · 2014-06-16T21:46:08.000-07:00
diff --git a/docx/oxml/shared.py b/docx/oxml/shared.py
@@ -8,7 +8,7 @@
 
 from . import OxmlElement
 from .ns import qn
-from .simpletypes import ST_DecimalNumber, ST_OnOff
+from .simpletypes import ST_DecimalNumber, ST_OnOff, ST_String
 from .xmlchemy import BaseOxmlElement, OptionalAttribute, RequiredAttribute
 
 
@@ -42,34 +42,34 @@ class CT_String(BaseOxmlElement):
     Used for ``<w:pStyle>`` and ``<w:tblStyle>`` elements and others,
     containing a style name in its ``val`` attribute.
     """
+    val = RequiredAttribute('w:val', ST_String)
+
     @classmethod
     def new(cls, nsptagname, val):
         """
         Return a new ``CT_String`` element with tagname *nsptagname* and
         ``val`` attribute set to *val*.
         """
-        return OxmlElement(nsptagname, attrs={qn('w:val'): val})
+        elm = OxmlElement(nsptagname)
+        elm.val = val
+        return elm
 
     @classmethod
     def new_pStyle(cls, val):
         """
         Return a new ``<w:pStyle>`` element with ``val`` attribute set to
         *val*.
         """
-        return OxmlElement('w:pStyle', attrs={qn('w:val'): val})
+        pStyle = OxmlElement('w:pStyle')
+        pStyle.val = val
+        return pStyle
 
     @classmethod
     def new_rStyle(cls, val):
         """
         Return a new ``<w:rStyle>`` element with ``val`` attribute set to
         *val*.
         """
-        return OxmlElement('w:rStyle', attrs={qn('w:val'): val})
-
-    @property
-    def val(self):
-        return self.get(qn('w:val'))
-
-    @val.setter
-    def val(self, val):
-        return self.set(qn('w:val'), val)
+        rStyle = OxmlElement('w:rStyle')
+        rStyle.val = val
+        return rStyle
diff --git a/docx/oxml/simpletypes.py b/docx/oxml/simpletypes.py
@@ -199,6 +199,10 @@ class ST_RelationshipId(XsdString):
     pass
 
 
+class ST_String(XsdString):
+    pass
+
+
 class ST_UniversalMeasure(BaseSimpleType):
 
     @classmethod
