tbl: add _Cell.text getter

Steve Canny · Steve Canny · commit 725df2761c3f · 2014-11-28T21:22:22.000-05:00
diff --git a/docx/table.py b/docx/table.py
@@ -7,7 +7,7 @@
 from __future__ import absolute_import, print_function, unicode_literals
 
 from .blkcntnr import BlockItemContainer
-from .shared import lazyproperty, Parented, write_only_property
+from .shared import lazyproperty, Parented
 
 
 class Table(Parented):
@@ -141,7 +141,16 @@ def tables(self):
         """
         return super(_Cell, self).tables
 
-    @write_only_property
+    @property
+    def text(self):
+        """
+        The entire contents of this cell as a string of text. Assigning
+        a string to this property replaces all existing content with a single
+        paragraph containing the assigned text in a single run.
+        """
+        return '\n'.join(p.text for p in self.paragraphs)
+
+    @text.setter
     def text(self, text):
         """
         Write-only. Set entire contents of cell to the string *text*. Any
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -187,6 +187,11 @@ def it_provides_access_to_the_tables_it_contains(self, tables_fixture):
             count += 1
         assert count == expected_count
 
+    def it_knows_what_text_it_contains(self, text_get_fixture):
+        cell, expected_text = text_get_fixture
+        text = cell.text
+        assert text == expected_text
+
     def it_can_replace_its_content_with_a_string_of_text(
             self, text_set_fixture):
         cell, text, expected_xml = text_set_fixture
@@ -247,6 +252,19 @@ def tables_fixture(self, request):
         cell = _Cell(element(cell_cxml), None)
         return cell, expected_count
 
+    @pytest.fixture(params=[
+        ('w:tc',                                     ''),
+        ('w:tc/w:p/w:r/w:t"foobar"',                 'foobar'),
+        ('w:tc/(w:p/w:r/w:t"foo",w:p/w:r/w:t"bar")', 'foo\nbar'),
+        ('w:tc/(w:tcPr,w:p/w:r/w:t"foobar")',        'foobar'),
+        ('w:tc/w:p/w:r/(w:t"fo",w:tab,w:t"ob",w:br,w:t"ar",w:br)',
+         'fo\tob\nar\n'),
+    ])
+    def text_get_fixture(self, request):
+        tc_cxml, expected_text = request.param
+        cell = _Cell(element(tc_cxml), None)
+        return cell, expected_text
+
     @pytest.fixture(params=[
         ('w:tc/w:p', 'foobar',
          'w:tc/w:p/w:r/w:t"foobar"'),
