tbl: base _Column on Parented

Steve Canny · Steve Canny · commit 958a97df98c7 · 2014-07-11T17:06:59.000-07:00
diff --git a/docx/table.py b/docx/table.py
@@ -26,7 +26,7 @@ def add_column(self):
         gridCol = tblGrid.add_gridCol()
         for tr in self._tbl.tr_lst:
             tr.add_tc()
-        return _Column(gridCol, self._tbl)
+        return _Column(gridCol, self._tbl, self)
 
     def add_row(self):
         """
@@ -109,12 +109,12 @@ def text(self, text):
         r.text = text
 
 
-class _Column(object):
+class _Column(Parented):
     """
     Table column
     """
-    def __init__(self, gridCol, tbl):
-        super(_Column, self).__init__()
+    def __init__(self, gridCol, tbl, parent):
+        super(_Column, self).__init__(parent)
         self._gridCol = gridCol
         self._tbl = tbl
 
@@ -197,10 +197,11 @@ def __getitem__(self, idx):
         except IndexError:
             msg = "column index [%d] is out of range" % idx
             raise IndexError(msg)
-        return _Column(gridCol, self._tbl)
+        return _Column(gridCol, self._tbl, self)
 
     def __iter__(self):
-        return (_Column(gridCol, self._tbl) for gridCol in self._gridCol_lst)
+        for gridCol in self._gridCol_lst:
+            yield _Column(gridCol, self._tbl, self)
 
     def __len__(self):
         return len(self._gridCol_lst)
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -154,7 +154,7 @@ def paragraphs_fixture(self):
 class Describe_Column(object):
 
     def it_provides_access_to_the_column_cells(self):
-        column = _Column(None, None)
+        column = _Column(None, None, None)
         cells = column.cells
         assert isinstance(cells, _ColumnCells)
 
@@ -180,7 +180,7 @@ def it_can_change_its_width(self, width_set_fixture):
     ])
     def width_get_fixture(self, request):
         gridCol_cxml, expected_width = request.param
-        column = _Column(element(gridCol_cxml), None)
+        column = _Column(element(gridCol_cxml), None, None)
         return column, expected_width
 
     @pytest.fixture(params=[
@@ -191,7 +191,7 @@ def width_get_fixture(self, request):
     ])
     def width_set_fixture(self, request):
         gridCol_cxml, new_value, expected_cxml = request.param
-        column = _Column(element(gridCol_cxml), None)
+        column = _Column(element(gridCol_cxml), None, None)
         expected_xml = xml(expected_cxml)
         return column, new_value, expected_xml
 
