tbl: remove now-dead code

Steve Canny · Steve Canny · commit ba3c7578014d · 2014-11-28T21:22:23.000-05:00
* remove _RowCells and tests
* make _Row.cells_new _Row.cells and remove prior version
diff --git a/docx/table.py b/docx/table.py
@@ -335,16 +335,8 @@ def __init__(self, tr, parent):
         super(_Row, self).__init__(parent)
         self._tr = tr
 
-    @lazyproperty
-    def cells(self):
-        """
-        Sequence of |_Cell| instances corresponding to cells in this row.
-        Supports ``len()``, iteration and indexed access.
-        """
-        return _RowCells(self._tr, self)
-
     @property
-    def cells_new(self):
+    def cells(self):
         """
         Sequence of |_Cell| instances corresponding to cells in this row.
         """
@@ -365,32 +357,6 @@ def _index(self):
         return self._tr.tr_idx
 
 
-class _RowCells(Parented):
-    """
-    Sequence of |_Cell| instances corresponding to the cells in a table row.
-    """
-    def __init__(self, tr, parent):
-        super(_RowCells, self).__init__(parent)
-        self._tr = tr
-
-    def __getitem__(self, idx):
-        """
-        Provide indexed access, (e.g. 'cells[0]')
-        """
-        try:
-            tc = self._tr.tc_lst[idx]
-        except IndexError:
-            msg = "cell index [%d] is out of range" % idx
-            raise IndexError(msg)
-        return _Cell(tc, self)
-
-    def __iter__(self):
-        return (_Cell(tc, self) for tc in self._tr.tc_lst)
-
-    def __len__(self):
-        return len(self._tr.tc_lst)
-
-
 class _Rows(Parented):
     """
     Sequence of |_Row| instances corresponding to the rows in a table.
diff --git a/features/steps/table.py b/features/steps/table.py
@@ -269,7 +269,7 @@ def then_the_reported_width_of_the_cell_is_width(context, width):
 @then('the row cells text is {expected_text}')
 def then_the_row_cells_text_is_expected_text(context, expected_text):
     table = context.table_
-    cells_text = ' '.join(c.text for row in table.rows for c in row.cells_new)
+    cells_text = ' '.join(c.text for row in table.rows for c in row.cells)
     assert cells_text == expected_text, 'got %s' % cells_text
 
 
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -11,7 +11,7 @@
 from docx.oxml import parse_xml
 from docx.shared import Inches
 from docx.table import (
-    _Cell, _Column, _ColumnCells, _Columns, _Row, _RowCells, _Rows, Table
+    _Cell, _Column, _ColumnCells, _Columns, _Row, _Rows, Table
 )
 from docx.text import Paragraph
 
@@ -500,15 +500,10 @@ class Describe_Row(object):
 
     def it_provides_access_to_its_cells(self, cells_fixture):
         row, row_idx, expected_cells = cells_fixture
-        cells = row.cells_new
+        cells = row.cells
         row.table.row_cells.assert_called_once_with(row_idx)
         assert cells == expected_cells
 
-    def it_provides_access_to_the_row_cells(self):
-        row = _Row(element('w:tr'), None)
-        cells = row.cells
-        assert isinstance(cells, _RowCells)
-
     def it_provides_access_to_the_table_it_belongs_to(self, table_fixture):
         row, table_ = table_fixture
         assert row.table is table_
@@ -559,44 +554,6 @@ def table_prop_(self, request, table_):
         return property_mock(request, _Row, 'table', return_value=table_)
 
 
-class Describe_RowCells(object):
-
-    def it_knows_how_many_cells_it_contains(self, cell_count_fixture):
-        cells, cell_count = cell_count_fixture
-        assert len(cells) == cell_count
-
-    def it_can_iterate_over_its__Cell_instances(self, cell_count_fixture):
-        cells, cell_count = cell_count_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, cell_count_fixture):
-        cells, cell_count = cell_count_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, cell_count_fixture):
-        cells, cell_count = cell_count_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 cell_count_fixture(self):
-        cells = _RowCells(element('w:tr/(w:tc, w:tc)'), None)
-        cell_count = 2
-        return cells, cell_count
-
-
 class Describe_Rows(object):
 
     def it_knows_how_many_rows_it_contains(self, rows_fixture):
