tbl: add Table._column_count

Steve Canny · Steve Canny · commit 7fb29b155218 · 2014-11-28T21:22:23.000-05:00
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
@@ -53,6 +53,13 @@ def new(cls):
         tbl = parse_xml(cls._tbl_xml())
         return tbl
 
+    @property
+    def col_count(self):
+        """
+        The number of grid columns in this table.
+        """
+        return len(self.tblGrid.gridCol_lst)
+
     @classmethod
     def _tbl_xml(cls):
         return (
diff --git a/docx/table.py b/docx/table.py
@@ -120,7 +120,7 @@ def _column_count(self):
         """
         The number of grid columns in this table.
         """
-        raise NotImplementedError
+        return self._tbl.col_count
 
     @property
     def _tblPr(self):
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -80,6 +80,11 @@ def it_knows_it_is_the_table_its_children_belong_to(self, table_fixture):
         table = table_fixture
         assert table.table is table
 
+    def it_knows_its_column_count_to_help(self, column_count_fixture):
+        table, expected_value = column_count_fixture
+        column_count = table._column_count
+        assert column_count == expected_value
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
@@ -125,6 +130,13 @@ def autofit_set_fixture(self, request):
         expected_xml = xml(expected_tbl_cxml)
         return table, new_value, expected_xml
 
+    @pytest.fixture
+    def column_count_fixture(self):
+        tbl_cxml = 'w:tbl/w:tblGrid/(w:gridCol,w:gridCol,w:gridCol)'
+        expected_value = 3
+        table = Table(element(tbl_cxml), None)
+        return table, expected_value
+
     @pytest.fixture
     def row_cells_fixture(self, _cells_, _column_count_):
         table = Table(None, None)
