api: remove old Document.add_table()

Steve Canny · Steve Canny · commit bd16fc7e05aa · 2015-02-14T23:03:33.000-08:00
diff --git a/docx/api.py b/docx/api.py
@@ -68,14 +68,7 @@ def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         return self._document.add_section(start_type)
 
     def add_table(self, rows, cols, style='Light Shading Accent 1'):
-        """
-        Add a table having row and column counts of *rows* and *cols*
-        respectively and table style of *style*. If *style* is |None|, a
-        table with no style is produced.
-        """
-        table = self._document_part.add_table(rows, cols)
-        table.style = style
-        return table
+        return self._document.add_table(rows, cols, style)
 
     @property
     def core_properties(self):
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -24,13 +24,6 @@ class DocumentPart(XmlPart):
     """
     Main document part of a WordprocessingML (WML) package, aka a .docx file.
     """
-    def add_table(self, rows, cols):
-        """
-        Return a table having *rows* rows and *cols* columns, newly appended
-        to the main document story.
-        """
-        return self.body.add_table(rows, cols)
-
     @lazyproperty
     def body(self):
         """
diff --git a/tests/parts/test_document.py b/tests/parts/test_document.py
@@ -68,12 +68,6 @@ def it_provides_access_to_the_inline_shapes_in_the_document(
         InlineShapes_.assert_called_once_with(body_elm, document)
         assert inline_shapes is InlineShapes_.return_value
 
-    def it_can_add_a_table(self, add_table_fixture):
-        document_part, rows, cols, body_, table_ = add_table_fixture
-        table = document_part.add_table(rows, cols)
-        body_.add_table.assert_called_once_with(rows, cols)
-        assert table is table_
-
     def it_can_add_an_image_part_to_the_document(
             self, get_or_add_image_fixture):
         (document, image_descriptor_, image_parts_, relate_to_, image_part_,
@@ -128,12 +122,6 @@ def it_creates_default_styles_part_if_not_present_to_help(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_table_fixture(self, document_part_body_, body_, table_):
-        document_part = DocumentPart(None, None, None, None)
-        rows, cols = 2, 4
-        return document_part, rows, cols, body_, table_
-
     @pytest.fixture
     def body_fixture(self, _Body_):
         document_elm = (
@@ -229,11 +217,8 @@ def _Body_(self, request):
         return class_mock(request, 'docx.parts.document._Body')
 
     @pytest.fixture
-    def body_(self, request, p_, table_):
-        body_ = instance_mock(request, _Body)
-        body_.add_paragraph.return_value = p_
-        body_.add_table.return_value = table_
-        return body_
+    def body_(self, request):
+        return instance_mock(request, _Body)
 
     @pytest.fixture
     def document_part_body_(self, request, body_):
@@ -326,10 +311,6 @@ def styles_prop_(self, request, styles_):
     def _styles_part_prop_(self, request):
         return property_mock(request, DocumentPart, '_styles_part')
 
-    @pytest.fixture
-    def table_(self, request):
-        return instance_mock(request, Table)
-
     @pytest.fixture
     def tables_(self, request):
         return instance_mock(request, list)
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -20,7 +20,6 @@
 from docx.parts.numbering import NumberingPart
 from docx.section import Section
 from docx.styles.styles import Styles
-from docx.table import Table
 from docx.text.run import Run
 
 from .unitutil.mock import (
@@ -89,13 +88,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_can_add_a_table(self, add_table_fixture):
-        document, rows, cols, style, table_ = add_table_fixture
-        table = document.add_table(rows, cols, style)
-        document._document_part.add_table.assert_called_once_with(rows, cols)
-        assert table.style == style
-        assert table == table_
-
     def it_provides_access_to_the_document_inline_shapes(self, document):
         body = document.inline_shapes
         assert body is document._document_part.inline_shapes
@@ -150,12 +142,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_table_fixture(self, request, document, document_part_, table_):
-        rows, cols = 4, 2
-        style = 'Light Shading Accent 1'
-        return document, rows, cols, style, table_
-
     @pytest.fixture
     def core_props_fixture(self, document, core_properties_):
         document._package.core_properties = core_properties_
@@ -210,11 +196,10 @@ def document_obj_(self, request):
         return instance_mock(request, docx.document.Document)
 
     @pytest.fixture
-    def document_part_(self, request, paragraphs_, table_, tables_):
+    def document_part_(self, request, paragraphs_, tables_):
         document_part_ = instance_mock(
             request, DocumentPart, content_type=CT.WML_DOCUMENT_MAIN
         )
-        document_part_.add_table.return_value = table_
         document_part_.paragraphs = paragraphs_
         document_part_.tables = tables_
         return document_part_
@@ -276,10 +261,6 @@ def section_(self, request):
     def styles_(self, request):
         return instance_mock(request, Styles)
 
-    @pytest.fixture
-    def table_(self, request):
-        return instance_mock(request, Table, style=None)
-
     @pytest.fixture
     def tables_(self, request):
         return instance_mock(request, list)
