blkct: add BlockItemContainer.tables

Steve Canny · Steve Canny · commit b9bb31629166 · 2014-07-17T23:45:45.000-07:00
* remove implementation from _Body to allow inheritance
diff --git a/docx/blkcntnr.py b/docx/blkcntnr.py
@@ -59,3 +59,12 @@ def paragraphs(self):
         order. Read-only.
         """
         return [Paragraph(p, self) for p in self._element.p_lst]
+
+    @property
+    def tables(self):
+        """
+        A list containing the tables in this container, in document order.
+        Read-only.
+        """
+        from .table import Table
+        return [Table(tbl, self) for tbl in self._element.tbl_lst]
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -17,7 +17,6 @@
 from ..section import Section
 from ..shape import InlineShape
 from ..shared import lazyproperty, Parented
-from ..table import Table
 
 
 class DocumentPart(XmlPart):
@@ -131,14 +130,6 @@ def clear_content(self):
         self._body.clear_content()
         return self
 
-    @property
-    def tables(self):
-        """
-        A sequence containing all the tables in the document, in the order
-        they appear.
-        """
-        return [Table(tbl, self) for tbl in self._body.tbl_lst]
-
 
 class InlineShapes(Parented):
     """
diff --git a/tests/test_blkcntnr.py b/tests/test_blkcntnr.py
@@ -42,6 +42,18 @@ def it_provides_access_to_the_paragraphs_it_contains(
             count += 1
         assert count == expected_count
 
+    def it_provides_access_to_the_tables_it_contains(self, tables_fixture):
+        # test len(), iterable, and indexed access
+        blkcntnr, expected_count = tables_fixture
+        tables = blkcntnr.tables
+        assert len(tables) == expected_count
+        count = 0
+        for idx, table in enumerate(tables):
+            assert isinstance(table, Table)
+            assert tables[idx] is table
+            count += 1
+        assert count == expected_count
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -87,3 +99,15 @@ def paragraphs_fixture(self, request):
         blkcntnr_cxml, expected_count = request.param
         blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
         return blkcntnr, expected_count
+
+    @pytest.fixture(params=[
+        ('w:body',                   0),
+        ('w:body/w:tbl',             1),
+        ('w:body/(w:tbl,w:tbl)',     2),
+        ('w:body/(w:p,w:tbl)',       1),
+        ('w:body/(w:tbl,w:tbl,w:p)', 2),
+    ])
+    def tables_fixture(self, request):
+        blkcntnr_cxml, expected_count = request.param
+        blkcntnr = BlockItemContainer(element(blkcntnr_cxml), None)
+        return blkcntnr, expected_count
