tbl: add _Column.cells

Steve Canny · Steve Canny · commit 8ba64d4240e0 · 2013-12-22T15:40:29.000-08:00
diff --git a/docx/table.py b/docx/table.py
@@ -25,7 +25,7 @@ def add_column(self):
         gridCol = tblGrid.add_gridCol()
         for tr in self._tbl.tr_lst:
             tr.add_tc()
-        return _Column(gridCol)
+        return _Column(gridCol, self._tbl)
 
     def add_row(self):
         """
@@ -67,16 +67,29 @@ class _Column(object):
     """
     Table column
     """
-    def __init__(self, gridCol):
+    def __init__(self, gridCol, tbl):
         super(_Column, self).__init__()
         self._gridCol = gridCol
+        self._tbl = tbl
+
+    @lazyproperty
+    def cells(self):
+        """
+        |_ColumnCellCollection| instance containing sequence of |_Cell|
+        instances corresponding to cells in this column.
+        """
+        return _ColumnCellCollection(self._tbl, self._gridCol)
 
 
 class _ColumnCellCollection(object):
     """
     Sequence of |_Cell| instances corresponding to the cells in a table
     column.
     """
+    def __init__(self, tbl, gridCol):
+        super(_ColumnCellCollection, self).__init__()
+        self._tbl = tbl
+        self._gridCol = gridCol
 
 
 class _ColumnCollection(object):
@@ -96,10 +109,10 @@ def __getitem__(self, idx):
         except IndexError:
             msg = "column index [%d] is out of range" % idx
             raise IndexError(msg)
-        return _Column(gridCol)
+        return _Column(gridCol, self._tbl)
 
     def __iter__(self):
-        return (_Column(gridCol) for gridCol in self._gridCol_lst)
+        return (_Column(gridCol, self._tbl) for gridCol in self._gridCol_lst)
 
     def __len__(self):
         return len(self._gridCol_lst)
@@ -122,7 +135,7 @@ def __init__(self, tr):
         super(_Row, self).__init__()
         self._tr = tr
 
-    @property
+    @lazyproperty
     def cells(self):
         """
         Sequence of |_Cell| instances corresponding to the cells in this row.
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -9,8 +9,8 @@
 import pytest
 
 from docx.table import (
-    _Cell, _Column, _ColumnCollection, _Row, _RowCellCollection,
-    _RowCollection, Table
+    _Cell, _Column, _ColumnCellCollection, _ColumnCollection, _Row,
+    _RowCellCollection, _RowCollection, Table
 )
 
 from .oxml.unitdata.table import a_gridCol, a_tbl, a_tblGrid, a_tc, a_tr
@@ -71,6 +71,19 @@ def table(self):
         return table
 
 
+class Describe_Column(object):
+
+    def it_provides_access_to_the_column_cells(self, column):
+        cells = column.cells
+        assert isinstance(cells, _ColumnCellCollection)
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture
+    def column(self):
+        return _Column(None, None)
+
+
 class Describe_ColumnCollection(object):
 
     def it_knows_how_many_columns_it_contains(self, columns_fixture):
