tbl: add _Column.width setter

Steve Canny · Steve Canny · commit 1b753b3a5894 · 2014-06-17T21:40:33.000-07:00
diff --git a/docx/shared.py b/docx/shared.py
@@ -62,7 +62,7 @@ def twips(self):
         """
         The equivalent length expressed in twips (int).
         """
-        return int(round(self / float(self._EMUS_PER_TWIP)) + 0.1)
+        return int(round(self / float(self._EMUS_PER_TWIP)))
 
 
 class Inches(Length):
diff --git a/docx/table.py b/docx/table.py
@@ -140,6 +140,10 @@ def width(self):
         """
         return self._gridCol.w
 
+    @width.setter
+    def width(self, value):
+        self._gridCol.w = value
+
 
 class _ColumnCells(object):
     """
diff --git a/features/steps/table.py b/features/steps/table.py
@@ -287,7 +287,9 @@ def then_new_row_has_2_cells(context):
 @then('the reported column width is {width_emu}')
 def then_the_reported_column_width_is_width_emu(context, width_emu):
     expected_value = None if width_emu == 'None' else int(width_emu)
-    assert context.column.width == expected_value
+    assert context.column.width == expected_value, (
+        'got %s' % context.column.width
+    )
 
 
 @then('the table style matches the name I applied')
diff --git a/features/tbl-col-props.feature b/features/tbl-col-props.feature
@@ -14,16 +14,15 @@ Feature: Get and set table column widths
       | 1440                | 914400      |
 
 
-  @wip
   Scenario Outline: Set column width
     Given a table column having a width of <width>
      When I set the column width to <new-width>
-     Then the reported column width is <new-width>
+     Then the reported column width is <width-emu>
 
     Examples: table column width values
-      | width               | new-width |
-      | no explicit setting | None      |
-      | no explicit setting | 914400    |
-      | 1440                | None      |
-      | 1440                | 914400    |
-      | 1440                | 424242    |
+      | width               | new-width | width-emu |
+      | no explicit setting | None      | None      |
+      | no explicit setting | 914400    | 914400    |
+      | 1440                | None      | None      |
+      | 1440                | 914400    | 914400    |
+      | 1440                | 424497    | 424180    |
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -168,10 +168,16 @@ def it_provides_access_to_the_column_cells(self, column):
         cells = column.cells
         assert isinstance(cells, _ColumnCells)
 
-    def it_knows_its_width_in_EMU(self, width_fixture):
-        column, expected_width = width_fixture
+    def it_knows_its_width_in_EMU(self, width_get_fixture):
+        column, expected_width = width_get_fixture
         assert column.width == expected_width
 
+    def it_can_change_its_width(self, width_set_fixture):
+        column, value, expected_xml = width_set_fixture
+        column.width = value
+        assert column.width == value
+        assert column._gridCol.xml == expected_xml
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -182,21 +188,37 @@ def it_knows_its_width_in_EMU(self, width_fixture):
         ('12.5pt', 158750),
         (None,     None),
     ])
-    def width_fixture(self, request):
+    def width_get_fixture(self, request):
         w, expected_width = request.param
-        gridCol_bldr = a_gridCol().with_nsdecls()
-        if w is not None:
-            gridCol_bldr.with_w(w)
-        gridCol = gridCol_bldr.element
+        gridCol = self.gridCol_bldr(w).element
         column = _Column(gridCol, None)
         return column, expected_width
 
+    @pytest.fixture(params=[
+        (4242, None,   None),
+        (None, None,   None),
+        (4242, 914400, 1440),
+        (None, 914400, 1440),
+    ])
+    def width_set_fixture(self, request):
+        initial_w, value, expected_w = request.param
+        gridCol = self.gridCol_bldr(initial_w).element
+        column = _Column(gridCol, None)
+        expected_xml = self.gridCol_bldr(expected_w).xml()
+        return column, value, expected_xml
+
     # fixture components ---------------------------------------------
 
     @pytest.fixture
     def column(self):
         return _Column(None, None)
 
+    def gridCol_bldr(self, w=None):
+        gridCol_bldr = a_gridCol().with_nsdecls()
+        if w is not None:
+            gridCol_bldr.with_w(w)
+        return gridCol_bldr
+
 
 class Describe_ColumnCells(object):
 
