tbl: add Table.columns

Steve Canny · Steve Canny · commit c7e8c7ecdd01 · 2013-12-22T01:53:58.000-08:00
diff --git a/docx/table.py b/docx/table.py
@@ -37,6 +37,10 @@ def add_row(self):
             tr.add_tc()
         return _Row(tr)
 
+    @lazyproperty
+    def columns(self):
+        return _ColumnCollection(self._tbl)
+
     @lazyproperty
     def rows(self):
         return _RowCollection(self._tbl)
@@ -90,6 +94,9 @@ class _ColumnCollection(object):
     """
     Sequence of |_Column| instances corresponding to the columns in a table.
     """
+    def __init__(self, tbl):
+        super(_ColumnCollection, self).__init__()
+        self._tbl = tbl
 
 
 class _Row(object):
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -9,7 +9,8 @@
 import pytest
 
 from docx.table import (
-    _Cell, _CellCollection, _Column, _Row, _RowCollection, Table
+    _Cell, _CellCollection, _Column, _ColumnCollection, _Row, _RowCollection,
+    Table
 )
 
 from .oxml.unitdata.table import a_gridCol, a_tbl, a_tblGrid, a_tc, a_tr
@@ -18,11 +19,14 @@
 
 class DescribeTable(object):
 
-    def it_provides_access_to_the_table_rows(self, row_access_fixture):
-        table = row_access_fixture
+    def it_provides_access_to_the_table_rows(self, table):
         rows = table.rows
         assert isinstance(rows, _RowCollection)
 
+    def it_provides_access_to_the_table_columns(self, table):
+        columns = table.columns
+        assert isinstance(columns, _ColumnCollection)
+
     def it_can_add_a_column(self, add_column_fixture):
         table, expected_xml = add_column_fixture
         col = table.add_column()
@@ -52,7 +56,7 @@ def add_row_fixture(self):
         return table, expected_xml
 
     @pytest.fixture
-    def row_access_fixture(self):
+    def table(self):
         tbl = _tbl_bldr(rows=2, cols=2).element
         table = Table(tbl)
         return table
