tbl: refactor Table.add_row() to _RowColl.add()

Steve Canny · Steve Canny · commit ce4ab900e501 · 2013-12-22T16:40:38.000-08:00
diff --git a/docx/parts.py b/docx/parts.py
@@ -65,7 +65,7 @@ def add_table(self, rows, cols):
         for i in range(cols):
             table.columns.add()
         for i in range(rows):
-            table.add_row()
+            table.rows.add()
         return table
 
     def clear_content(self):
diff --git a/docx/table.py b/docx/table.py
@@ -17,16 +17,6 @@ def __init__(self, tbl):
         super(Table, self).__init__()
         self._tbl = tbl
 
-    def add_row(self):
-        """
-        Return a |_Row| instance, newly added bottom-most to the table.
-        """
-        tbl = self._tbl
-        tr = tbl.add_tr()
-        for gridCol in tbl.tblGrid.gridCol_lst:
-            tr.add_tc()
-        return _Row(tr)
-
     def cell(self, row_idx, col_idx):
         """
         Return |_Cell| instance correponding to table cell at *row_idx*,
@@ -222,3 +212,13 @@ def __iter__(self):
 
     def __len__(self):
         return len(self._tbl.tr_lst)
+
+    def add(self):
+        """
+        Return a |_Row| instance, newly added bottom-most to the table.
+        """
+        tbl = self._tbl
+        tr = tbl.add_tr()
+        for gridCol in tbl.tblGrid.gridCol_lst:
+            tr.add_tc()
+        return _Row(tr)
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -36,21 +36,8 @@ def it_provides_access_to_a_cell_by_row_and_col_indices(self, table):
                 tc = tr.tc_lst[col_idx]
                 assert tc is cell._tc
 
-    def it_can_add_a_row(self, add_row_fixture):
-        table, expected_xml = add_row_fixture
-        row = table.add_row()
-        assert table._tbl.xml == expected_xml
-        assert isinstance(row, _Row)
-
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_row_fixture(self):
-        tbl = _tbl_bldr(rows=1, cols=2).element
-        table = Table(tbl)
-        expected_xml = _tbl_bldr(rows=2, cols=2).xml()
-        return table, expected_xml
-
     @pytest.fixture
     def table(self):
         tbl = _tbl_bldr(rows=2, cols=2).element
@@ -250,8 +237,21 @@ def it_raises_on_indexed_access_out_of_range(self, rows_fixture):
             too_high = row_count
             rows[too_high]
 
+    def it_can_add_a_row(self, add_row_fixture):
+        rows, expected_xml = add_row_fixture
+        row = rows.add()
+        assert rows._tbl.xml == expected_xml
+        assert isinstance(row, _Row)
+
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture
+    def add_row_fixture(self):
+        tbl = _tbl_bldr(rows=1, cols=2).element
+        rows = _RowCollection(tbl)
+        expected_xml = _tbl_bldr(rows=2, cols=2).xml()
+        return rows, expected_xml
+
     @pytest.fixture
     def rows_fixture(self):
         row_count = 2
