oxml: convert CT_R to xmlchemy

Steve Canny · Steve Canny · commit 34a475bb5c55 · 2014-06-17T01:29:05.000-07:00
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -106,50 +106,32 @@ class CT_R(BaseOxmlElement):
     """
     ``<w:r>`` element, containing the properties and text for a run.
     """
+    rPr = ZeroOrOne('w:rPr')
+    t = ZeroOrMore('w:t')
     br = ZeroOrMore('w:br')
+    drawing = ZeroOrMore('w:drawing')
 
-    def add_drawing(self, inline_or_anchor):
-        """
-        Return a newly appended ``CT_Drawing`` (``<w:drawing>``) child
-        element having *inline_or_anchor* as its child.
-        """
-        drawing = OxmlElement('w:drawing')
-        self.append(drawing)
-        drawing.append(inline_or_anchor)
-        return drawing
+    def _insert_rPr(self, rPr):
+        self.insert(0, rPr)
+        return rPr
 
     def add_t(self, text):
         """
-        Return a newly added CT_T (<w:t>) element containing *text*.
+        Return a newly added ``<w:t>`` element containing *text*.
         """
-        t = CT_Text.new(text)
+        t = self._add_t(text=text)
         if len(text.strip()) < len(text):
             t.set(qn('xml:space'), 'preserve')
-        self.append(t)
         return t
 
-    def get_or_add_rPr(self):
-        """
-        Return the rPr child element, newly added if not present.
-        """
-        rPr = self.rPr
-        if rPr is None:
-            rPr = self._add_rPr()
-        return rPr
-
-    @classmethod
-    def new(cls):
-        """
-        Return a new ``<w:r>`` element.
-        """
-        return OxmlElement('w:r')
-
-    @property
-    def rPr(self):
+    def add_drawing(self, inline_or_anchor):
         """
-        ``<w:rPr>`` child element or None if not present.
+        Return a newly appended ``CT_Drawing`` (``<w:drawing>``) child
+        element having *inline_or_anchor* as its child.
         """
-        return self.find(qn('w:rPr'))
+        drawing = self._add_drawing()
+        drawing.append(inline_or_anchor)
+        return drawing
 
     @property
     def style(self):
@@ -171,13 +153,6 @@ def style(self, style):
         rPr = self.get_or_add_rPr()
         rPr.style = style
 
-    @property
-    def t_lst(self):
-        """
-        Sequence of <w:t> elements in this paragraph.
-        """
-        return self.findall(qn('w:t'))
-
     @property
     def underline(self):
         """
@@ -194,14 +169,6 @@ def underline(self, value):
         rPr = self.get_or_add_rPr()
         rPr.underline = value
 
-    def _add_rPr(self):
-        """
-        Return a newly added rPr child element. Assumes one is not present.
-        """
-        rPr = CT_RPr.new()
-        self.insert(0, rPr)
-        return rPr
-
 
 class CT_RPr(BaseOxmlElement):
     """
@@ -699,14 +666,6 @@ class CT_Text(BaseOxmlElement):
     """
     ``<w:t>`` element, containing a sequence of characters within a run.
     """
-    @classmethod
-    def new(cls, text):
-        """
-        Return a new ``<w:t>`` element.
-        """
-        t = OxmlElement('w:t')
-        t.text = text
-        return t
 
 
 class CT_Underline(BaseOxmlElement):
diff --git a/tests/oxml/test_text.py b/tests/oxml/test_text.py
@@ -81,10 +81,6 @@ def it_can_set_the_paragraph_style(self):
 
 class DescribeCT_R(object):
 
-    def it_can_construct_a_new_r_element(self):
-        r = CT_R.new()
-        assert r.xml == an_r().with_nsdecls().xml()
-
     def it_can_add_a_t_to_itself(self):
         text = 'foobar'
         r = an_r().with_nsdecls().element
@@ -111,11 +107,3 @@ def it_has_a_sequence_of_the_t_elms_it_contains(self):
             assert len(r.t_lst) == expected_len
             for t in r.t_lst:
                 assert isinstance(t, CT_Text)
-
-
-class DescribeCT_Text(object):
-
-    def it_can_construct_a_new_t_element(self):
-        text = 'foobar'
-        t = CT_Text.new(text)
-        assert t.xml == a_t().with_nsdecls().with_text(text).xml()
