api: remove old Document.tables

Steve Canny · Steve Canny · commit 2bad8ed7ed48 · 2015-02-15T12:48:11.000-08:00
diff --git a/docx/api.py b/docx/api.py
@@ -97,9 +97,4 @@ def styles(self):
 
     @property
     def tables(self):
-        """
-        A list of |Table| instances corresponding to the tables in the
-        document, in document order. Note that tables within revision marks
-        such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
-        """
-        return self._document_part.tables
+        return self._document.tables
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -125,15 +125,6 @@ def styles(self):
         """
         return self._styles_part.styles
 
-    @property
-    def tables(self):
-        """
-        A list of |Table| instances corresponding to the tables in the
-        document, in document order. Note that tables within revision marks
-        such as ``<w:ins>`` or ``<w:del>`` do not appear in this list.
-        """
-        return self.body.tables
-
     @property
     def _styles_part(self):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
@@ -45,11 +45,6 @@ def it_has_a_body(self, body_fixture):
         _Body_.assert_called_once_with(body_elm, document_part)
         assert _body is _Body_.return_value
 
-    def it_provides_access_to_the_document_tables(self, tables_fixture):
-        document_part, tables_ = tables_fixture
-        tables = document_part.tables
-        assert tables is tables_
-
     def it_provides_access_to_the_document_styles(self, styles_fixture):
         document_part, styles_ = styles_fixture
         styles = document_part.styles
@@ -232,32 +227,16 @@ def styles_part_get_fixture(self, part_related_by_, styles_part_):
         part_related_by_.return_value = styles_part_
         return document_part, styles_part_
 
-    @pytest.fixture
-    def tables_fixture(self, document_part_body_, body_, tables_):
-        document_part = DocumentPart(None, None, None, None)
-        body_.tables = tables_
-        return document_part, tables_
-
     # fixture components ---------------------------------------------
 
     @pytest.fixture
     def _Body_(self, request):
         return class_mock(request, 'docx.parts.document._Body')
 
-    @pytest.fixture
-    def body_(self, request):
-        return instance_mock(request, _Body)
-
     @pytest.fixture
     def core_properties_(self, request):
         return instance_mock(request, CoreProperties)
 
-    @pytest.fixture
-    def document_part_body_(self, request, body_):
-        return property_mock(
-            request, DocumentPart, 'body', return_value=body_
-        )
-
     @pytest.fixture
     def get_or_add_image_fixture(
             self, request, package_, image_descriptor_, image_parts_,
@@ -343,10 +322,6 @@ def styles_prop_(self, request, styles_):
     def _styles_part_prop_(self, request):
         return property_mock(request, DocumentPart, '_styles_part')
 
-    @pytest.fixture
-    def tables_(self, request):
-        return instance_mock(request, list)
-
 
 class Describe_Body(object):
 
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -14,8 +14,6 @@
 
 from docx.api import Document, DocumentNew
 from docx.opc.constants import CONTENT_TYPE as CT
-from docx.package import Package
-from docx.parts.document import DocumentPart
 
 from .unitutil.mock import function_mock, instance_mock, class_mock
 
@@ -77,54 +75,3 @@ def document_(self, request):
     @pytest.fixture
     def Package_(self, request):
         return class_mock(request, 'docx.api.Package')
-
-
-class DescribeDocumentOld(object):
-
-    def it_provides_access_to_the_document_tables(self, tables_fixture):
-        document, tables_ = tables_fixture
-        tables = document.tables
-        assert tables is tables_
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def tables_fixture(self, document, tables_):
-        return document, tables_
-
-    # fixture components ---------------------------------------------
-
-    @pytest.fixture
-    def document(self, open_):
-        return Document()
-
-    @pytest.fixture
-    def document_obj_(self, request):
-        return instance_mock(request, docx.document.Document)
-
-    @pytest.fixture
-    def document_part_(self, request, tables_):
-        document_part_ = instance_mock(
-            request, DocumentPart, content_type=CT.WML_DOCUMENT_MAIN
-        )
-        document_part_.tables = tables_
-        return document_part_
-
-    @pytest.fixture
-    def open_(self, request, document_obj_, document_part_, package_):
-        document_part_.package = package_
-        document_obj_._part = document_part_
-        return function_mock(
-            request, 'docx.api.DocumentNew',
-            return_value=document_obj_
-        )
-
-    @pytest.fixture
-    def package_(self, request, document_part_):
-        package_ = instance_mock(request, Package)
-        package_.main_document_part = document_part_
-        return package_
-
-    @pytest.fixture
-    def tables_(self, request):
-        return instance_mock(request, list)
