tbl: add Table.cell()

Steve Canny · Steve Canny · commit 050e00bf0cc4 · 2013-12-22T14:25:13.000-08:00
diff --git a/docx/table.py b/docx/table.py
@@ -37,6 +37,14 @@ def add_row(self):
             tr.add_tc()
         return _Row(tr)
 
+    def cell(self, row_idx, col_idx):
+        """
+        Return |_Cell| instance correponding to table cell at *row_idx*,
+        *col_idx* intersection, where (0, 0) is the top, left-most cell.
+        """
+        row = self.rows[row_idx]
+        return row.cells[col_idx]
+
     @lazyproperty
     def columns(self):
         return _ColumnCollection(self._tbl)
diff --git a/features/steps/table.py b/features/steps/table.py
@@ -64,6 +64,15 @@ def given_a_table_row_having_two_cells(context):
 
 # then =====================================================
 
+@then('I can access a cell using its row and column indices')
+def then_can_access_cell_using_its_row_and_col_indices(context):
+    table = context.table_
+    for row_idx in range(2):
+        for col_idx in range(2):
+            cell = table.cell(row_idx, col_idx)
+            assert isinstance(cell, _Cell)
+
+
 @then('I can access a collection cell by index')
 def then_can_access_collection_cell_by_index(context):
     cells = context.cells
diff --git a/features/tbl-item-access.feature b/features/tbl-item-access.feature
@@ -32,3 +32,7 @@ Feature: Access table rows, columns, and cells
      Given a cell collection having two cells
       Then I can iterate over the cell collection
        And I can access a collection cell by index
+
+  Scenario: Access cell in table
+     Given a table having two rows
+      Then I can access a cell using its row and column indices
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -27,6 +27,15 @@ def it_provides_access_to_the_table_columns(self, table):
         columns = table.columns
         assert isinstance(columns, _ColumnCollection)
 
+    def it_provides_access_to_a_cell_by_row_and_col_indices(self, table):
+        for row_idx in range(2):
+            for col_idx in range(2):
+                cell = table.cell(row_idx, col_idx)
+                assert isinstance(cell, _Cell)
+                tr = table._tbl.tr_lst[row_idx]
+                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()
