oxml: add CT_Text.new()

Steve Canny · Steve Canny · commit 9ca8f46474c5 · 2013-12-20T20:10:44.000-08:00
diff --git a/docx/oxml/__init__.py b/docx/oxml/__init__.py
@@ -14,7 +14,7 @@
 
 from docx.oxml.base import register_custom_element_class
 from docx.oxml.parts import CT_Body
-from docx.oxml.text import CT_P, CT_R
+from docx.oxml.text import CT_P, CT_R, CT_Text
 
 
 # ===========================================================================
@@ -24,3 +24,4 @@
 register_custom_element_class('w:body',     CT_Body)
 register_custom_element_class('w:p',        CT_P)
 register_custom_element_class('w:r',        CT_R)
+register_custom_element_class('w:t',        CT_Text)
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -48,3 +48,16 @@ def new():
         """
         xml = '<w:r %s/>' % nsdecls('w')
         return oxml_fromstring(xml)
+
+
+class CT_Text(OxmlBaseElement):
+    """
+    ``<w:t>`` element, containing a sequence of characters within a run.
+    """
+    @staticmethod
+    def new(text):
+        """
+        Return a new ``<w:t>`` element.
+        """
+        xml = '<w:t %s>%s</w:t>' % (nsdecls('w'), text)
+        return oxml_fromstring(xml)
diff --git a/tests/oxml/test_text.py b/tests/oxml/test_text.py
@@ -9,9 +9,9 @@
 
 """Test suite for the docx.oxml.text module."""
 
-from docx.oxml.text import CT_P, CT_R
+from docx.oxml.text import CT_P, CT_R, CT_Text
 
-from ..unitdata import a_p, an_r
+from ..unitdata import a_p, a_t, an_r
 
 
 class DescribeCT_P(object):
@@ -35,3 +35,11 @@ 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
+
+
+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(text).with_nsdecls().xml
diff --git a/tests/unitdata.py b/tests/unitdata.py
@@ -134,6 +134,23 @@ def xml(self):
         return '%s<w:r%s/>\n' % (indent, self._nsdecls)
 
 
+class CT_TextBuilder(BaseBuilder):
+    """
+    Test data builder for a CT_Text (<w:t>) XML element that appears within a
+    run element.
+    """
+    def __init__(self, text):
+        """Establish instance variables with default values"""
+        super(CT_TextBuilder, self).__init__()
+        self._text = text
+
+    @property
+    def xml(self):
+        """Return element XML based on attribute settings"""
+        indent = ' ' * self._indent
+        return '%s<w:t%s>%s</w:t>\n' % (indent, self._nsdecls, self._text)
+
+
 class CT_SectPrBuilder(BaseBuilder):
     """
     Test data builder for a CT_SectPr (<w:sectPr>) XML element that appears
@@ -161,6 +178,11 @@ def a_p():
     return CT_PBuilder()
 
 
+def a_t(text):
+    """Return a CT_TextBuilder instance"""
+    return CT_TextBuilder(text)
+
+
 def a_sectPr():
     """Return a CT_SectPr instance"""
     return CT_SectPrBuilder()
