tbl: remove now-dead code

Steve Canny · Steve Canny · commit 8a9fdfcdff9a · 2014-11-28T21:45:42.000-05:00
diff --git a/docx/table.py b/docx/table.py
@@ -237,16 +237,8 @@ def __init__(self, gridCol, tbl, parent):
         self._gridCol = gridCol
         self._tbl = tbl
 
-    @lazyproperty
-    def cells(self):
-        """
-        Sequence of |_Cell| instances corresponding to cells in this column.
-        Supports ``len()``, iteration and indexed access.
-        """
-        return _ColumnCells(self._tbl, self._gridCol, self)
-
     @property
-    def cells_new(self):
+    def cells(self):
         """
         Sequence of |_Cell| instances corresponding to cells in this column.
         """
@@ -279,46 +271,6 @@ def _index(self):
         return self._gridCol.gridCol_idx
 
 
-class _ColumnCells(Parented):
-    """
-    Sequence of |_Cell| instances corresponding to the cells in a table
-    column.
-    """
-    def __init__(self, tbl, gridCol, parent):
-        super(_ColumnCells, self).__init__(parent)
-        self._tbl = tbl
-        self._gridCol = gridCol
-
-    def __getitem__(self, idx):
-        """
-        Provide indexed access, (e.g. 'cells[0]')
-        """
-        try:
-            tr = self._tr_lst[idx]
-        except IndexError:
-            msg = "cell index [%d] is out of range" % idx
-            raise IndexError(msg)
-        tc = tr.tc_lst[self._col_idx]
-        return _Cell(tc, self)
-
-    def __iter__(self):
-        for tr in self._tr_lst:
-            tc = tr.tc_lst[self._col_idx]
-            yield _Cell(tc, self)
-
-    def __len__(self):
-        return len(self._tr_lst)
-
-    @property
-    def _col_idx(self):
-        gridCol_lst = self._tbl.tblGrid.gridCol_lst
-        return gridCol_lst.index(self._gridCol)
-
-    @property
-    def _tr_lst(self):
-        return self._tbl.tr_lst
-
-
 class _Columns(Parented):
     """
     Sequence of |_Column| instances corresponding to the columns in a table.
diff --git a/features/steps/table.py b/features/steps/table.py
@@ -216,9 +216,7 @@ def then_table_cell_row_col_text_is_text(context, row, col, expected_text):
 @then('the column cells text is {expected_text}')
 def then_the_column_cells_text_is_expected_text(context, expected_text):
     table = context.table_
-    cells_text = ' '.join(
-        c.text for col in table.columns for c in col.cells_new
-    )
+    cells_text = ' '.join(c.text for col in table.columns for c in col.cells)
     assert cells_text == expected_text, 'got %s' % cells_text
 
 
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -10,9 +10,7 @@
 
 from docx.oxml import parse_xml
 from docx.shared import Inches
-from docx.table import (
-    _Cell, _Column, _ColumnCells, _Columns, _Row, _Rows, Table
-)
+from docx.table import _Cell, _Column, _Columns, _Row, _Rows, Table
 from docx.text import Paragraph
 
 from .oxml.unitdata.table import a_gridCol, a_tbl, a_tblGrid, a_tc, a_tr
@@ -390,7 +388,7 @@ class Describe_Column(object):
 
     def it_provides_access_to_its_cells(self, cells_fixture):
         column, column_idx, expected_cells = cells_fixture
-        cells = column.cells_new
+        cells = column.cells
         column.table.column_cells.assert_called_once_with(column_idx)
         assert cells == expected_cells
 
@@ -479,46 +477,6 @@ def table_prop_(self, request, table_):
         return property_mock(request, _Column, 'table', return_value=table_)
 
 
-class Describe_ColumnCells(object):
-
-    def it_knows_how_many_cells_it_contains(self, cells_fixture):
-        cells, cell_count = cells_fixture
-        assert len(cells) == cell_count
-
-    def it_can_iterate_over_its__Cell_instances(self, cells_fixture):
-        cells, cell_count = cells_fixture
-        actual_count = 0
-        for cell in cells:
-            assert isinstance(cell, _Cell)
-            actual_count += 1
-        assert actual_count == cell_count
-
-    def it_provides_indexed_access_to_cells(self, cells_fixture):
-        cells, cell_count = cells_fixture
-        for idx in range(-cell_count, cell_count):
-            cell = cells[idx]
-            assert isinstance(cell, _Cell)
-
-    def it_raises_on_indexed_access_out_of_range(self, cells_fixture):
-        cells, cell_count = cells_fixture
-        too_low = -1 - cell_count
-        too_high = cell_count
-        with pytest.raises(IndexError):
-            cells[too_low]
-        with pytest.raises(IndexError):
-            cells[too_high]
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture
-    def cells_fixture(self):
-        cell_count = 2
-        tbl = _tbl_bldr(rows=cell_count, cols=1).element
-        gridCol = tbl.tblGrid.gridCol_lst[0]
-        cells = _ColumnCells(tbl, gridCol, None)
-        return cells, cell_count
-
-
 class Describe_Columns(object):
 
     def it_knows_how_many_columns_it_contains(self, columns_fixture):
