tbl: add _Row.height getter

revossen-asml · Steve Canny · commit 6b6ef6b73053 · 2016-10-29T14:43:05.000-07:00
diff --git a/docx/oxml/table.py b/docx/oxml/table.py
@@ -76,6 +76,17 @@ def trHeight_hRule(self, value):
         trPr = self.get_or_add_trPr()
         trPr.trHeight_hRule = value
 
+    @property
+    def trHeight_val(self):
+        """
+        Return the value of `w:trPr/w:trHeight@w:val`, or |None| if not
+        present.
+        """
+        trPr = self.trPr
+        if trPr is None:
+            return None
+        return trPr.trHeight_val
+
     def _insert_tblPrEx(self, tblPrEx):
         self.insert(0, tblPrEx)
 
@@ -831,6 +842,16 @@ def trHeight_hRule(self, value):
         trHeight = self.get_or_add_trHeight()
         trHeight.hRule = value
 
+    @property
+    def trHeight_val(self):
+        """
+        Return the value of `w:trHeight@w:val`, or |None| if not present.
+        """
+        trHeight = self.trHeight
+        if trHeight is None:
+            return None
+        return trHeight.val
+
 
 class CT_VMerge(BaseOxmlElement):
     """
diff --git a/docx/table.py b/docx/table.py
@@ -374,7 +374,7 @@ class _Row(Parented):
     """
     def __init__(self, tr, parent):
         super(_Row, self).__init__(parent)
-        self._tr = tr
+        self._tr = self._element = tr
 
     @property
     def cells(self):
@@ -383,6 +383,14 @@ def cells(self):
         """
         return tuple(self.table.row_cells(self._index))
 
+    @property
+    def height(self):
+        """
+        Return a |Length| object representing the height of this cell, or
+        |None| if no explicit height is set.
+        """
+        return self._tr.trHeight_val
+
     @property
     def height_rule(self):
         """
diff --git a/features/tbl-row-props.feature b/features/tbl-row-props.feature
@@ -28,7 +28,6 @@ Feature: Get and set table row properties
       | no explicit setting | None     |
 
 
-  @wip
   Scenario Outline: Get Row.height
     Given a table row having height of <state>
      Then row.height is <value>
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -653,6 +653,10 @@ def table_(self, request):
 
 class Describe_Row(object):
 
+    def it_knows_its_height(self, height_get_fixture):
+        row, expected_height = height_get_fixture
+        assert row.height == expected_height
+
     def it_knows_its_height_rule(self, height_rule_get_fixture):
         row, expected_rule = height_rule_get_fixture
         assert row.height_rule == expected_rule
@@ -686,6 +690,18 @@ def cells_fixture(self, _index_, table_prop_, table_):
         table_.row_cells.return_value = list(expected_cells)
         return row, row_idx, expected_cells
 
+    @pytest.fixture(params=[
+        ('w:tr',                               None),
+        ('w:tr/w:trPr',                        None),
+        ('w:tr/w:trPr/w:trHeight',             None),
+        ('w:tr/w:trPr/w:trHeight{w:val=0}',    0),
+        ('w:tr/w:trPr/w:trHeight{w:val=1440}', 914400),
+    ])
+    def height_get_fixture(self, request):
+        tr_cxml, expected_height = request.param
+        row = _Row(element(tr_cxml), None)
+        return row, expected_height
+
     @pytest.fixture(params=[
         ('w:tr',        None),
         ('w:tr/w:trPr', None),
