tbl: refactor Table.add_column() to _ColColl.add()

Steve Canny · Steve Canny · commit d28e05388c97 · 2013-12-22T16:35:15.000-08:00
diff --git a/docx/parts.py b/docx/parts.py
@@ -63,7 +63,7 @@ def add_table(self, rows, cols):
         tbl = self._body.add_tbl()
         table = Table(tbl)
         for i in range(cols):
-            table.add_column()
+            table.columns.add()
         for i in range(rows):
             table.add_row()
         return table
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_column(self):
-        """
-        Return a |_Column| instance, newly added rightmost to the table.
-        """
-        tblGrid = self._tbl.tblGrid
-        gridCol = tblGrid.add_gridCol()
-        for tr in self._tbl.tr_lst:
-            tr.add_tc()
-        return _Column(gridCol, self._tbl)
-
     def add_row(self):
         """
         Return a |_Row| instance, newly added bottom-most to the table.
@@ -155,6 +145,16 @@ def _gridCol_lst(self):
         tblGrid = self._tbl.tblGrid
         return tblGrid.gridCol_lst
 
+    def add(self):
+        """
+        Return a |_Column| instance, newly added rightmost to the table.
+        """
+        tblGrid = self._tbl.tblGrid
+        gridCol = tblGrid.add_gridCol()
+        for tr in self._tbl.tr_lst:
+            tr.add_tc()
+        return _Column(gridCol, self._tbl)
+
 
 class _Row(object):
     """
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -36,12 +36,6 @@ 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_column(self, add_column_fixture):
-        table, expected_xml = add_column_fixture
-        col = table.add_column()
-        assert table._tbl.xml == expected_xml
-        assert isinstance(col, _Column)
-
     def it_can_add_a_row(self, add_row_fixture):
         table, expected_xml = add_row_fixture
         row = table.add_row()
@@ -50,13 +44,6 @@ def it_can_add_a_row(self, add_row_fixture):
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_column_fixture(self):
-        tbl = _tbl_bldr(2, 1).element
-        table = Table(tbl)
-        expected_xml = _tbl_bldr(2, 2).xml()
-        return table, expected_xml
-
     @pytest.fixture
     def add_row_fixture(self):
         tbl = _tbl_bldr(rows=1, cols=2).element
@@ -153,8 +140,21 @@ def it_raises_on_indexed_access_out_of_range(self, columns_fixture):
         with pytest.raises(IndexError):
             columns[too_high]
 
+    def it_can_add_a_column(self, add_column_fixture):
+        columns, expected_xml = add_column_fixture
+        column = columns.add()
+        assert columns._tbl.xml == expected_xml
+        assert isinstance(column, _Column)
+
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture
+    def add_column_fixture(self):
+        tbl = _tbl_bldr(2, 1).element
+        columns = _ColumnCollection(tbl)
+        expected_xml = _tbl_bldr(2, 2).xml()
+        return columns, expected_xml
+
     @pytest.fixture
     def columns_fixture(self):
         column_count = 2
