oxml: convert CT_Tc to xmlchemy

Steve Canny · Steve Canny · commit 7592a60ea91d · 2014-06-16T23:52:52.000-07:00
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
@@ -7,9 +7,9 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from . import OxmlElement
-from .ns import qn
-from .text import CT_P
-from .xmlchemy import BaseOxmlElement, OneAndOnlyOne, ZeroOrOne, ZeroOrMore
+from .xmlchemy import (
+    BaseOxmlElement, OneAndOnlyOne, OneOrMore, ZeroOrOne, ZeroOrMore
+)
 
 
 class CT_Row(BaseOxmlElement):
@@ -92,19 +92,25 @@ class CT_Tc(BaseOxmlElement):
     """
     ``<w:tc>`` table cell element
     """
-    def add_p(self):
+    tcPr = ZeroOrOne('w:tcPr')  # bunches of successors, overriding insert
+    p = OneOrMore('w:p')
+
+    def _insert_tcPr(self, tcPr):
         """
-        Return a new <w:p> element that has been added at the end of any
-        existing cell content.
+        ``tcPr`` has a bunch of successors, but it comes first if it appears,
+        so just overriding and using insert(0, ...) rather than spelling out
+        successors.
         """
-        p = CT_P.new()
-        self.append(p)
-        return p
+        self.insert(0, tcPr)
+        return tcPr
 
     def clear_content(self):
         """
         Remove all content child elements, preserving the ``<w:tcPr>``
-        element if present.
+        element if present. Note that this leaves the ``<w:tc>`` element in
+        an invalid state because it doesn't contain at least one block-level
+        element. It's up to the caller to add a ``<w:p>`` or ``<w:tbl>``
+        child element.
         """
         new_children = []
         tcPr = self.tcPr
@@ -119,20 +125,5 @@ def new(cls):
         required EG_BlockLevelElt.
         """
         tc = OxmlElement('w:tc')
-        p = CT_P.new()
-        tc.append(p)
+        tc._add_p()
         return tc
-
-    @property
-    def p_lst(self):
-        """
-        List of <w:p> child elements.
-        """
-        return self.findall(qn('w:p'))
-
-    @property
-    def tcPr(self):
-        """
-        <w:tcPr> child element or |None| if not present.
-        """
-        return self.find(qn('w:tcPr'))
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -61,15 +61,6 @@ def get_or_add_pPr(self):
             pPr = self._add_pPr()
         return pPr
 
-    @staticmethod
-    def new():
-        """
-        Return a new ``<w:p>`` element.
-        """
-        xml = '<w:p %s/>' % nsdecls('w')
-        p = parse_xml(xml)
-        return p
-
     @property
     def pPr(self):
         """
diff --git a/tests/oxml/test_text.py b/tests/oxml/test_text.py
@@ -4,18 +4,13 @@
 Test suite for the docx.oxml.text module.
 """
 
-from docx.oxml.text import CT_P, CT_PPr, CT_R, CT_Text
+from docx.oxml.text import CT_PPr, CT_R, CT_Text
 
 from .unitdata.text import a_p, a_pPr, a_pStyle, a_t, an_r
 
 
 class DescribeCT_P(object):
 
-    def it_can_construct_a_new_p_element(self):
-        p = CT_P.new()
-        expected_xml = a_p().with_nsdecls().xml()
-        assert p.xml == expected_xml
-
     def it_has_a_sequence_of_the_runs_it_contains(self):
         p = a_p().with_nsdecls().with_child(an_r()).with_child(an_r()).element
         assert len(p.r_lst) == 2
