txt: base Run on Parented

Steve Canny · Steve Canny · commit d77054ab1ccc · 2014-07-11T17:39:04.000-07:00
Remove stray print() call left in during testing.
diff --git a/docx/table.py b/docx/table.py
@@ -71,7 +71,6 @@ def style(self):
 
     @style.setter
     def style(self, value):
-        print('style value is %s' % value)
         self._tblPr.style = value
 
     @property
diff --git a/docx/text.py b/docx/text.py
@@ -73,7 +73,7 @@ def add_run(self, text=None, style=None):
         break.
         """
         r = self._p.add_r()
-        run = Run(r)
+        run = Run(r, self)
         if text:
             run.text = text
         if style:
@@ -124,7 +124,7 @@ def runs(self):
         Sequence of |Run| instances corresponding to the <w:r> elements in
         this paragraph.
         """
-        return [Run(r) for r in self._p.r_lst]
+        return [Run(r, self) for r in self._p.r_lst]
 
     @property
     def style(self):
@@ -163,16 +163,16 @@ def text(self, text):
         self.add_run(text)
 
 
-class Run(object):
+class Run(Parented):
     """
     Proxy object wrapping ``<w:r>`` element. Several of the properties on Run
     take a tri-state value, |True|, |False|, or |None|. |True| and |False|
     correspond to on and off respectively. |None| indicates the property is
     not specified directly on the run and its effective value is taken from
     the style hierarchy.
     """
-    def __init__(self, r):
-        super(Run, self).__init__()
+    def __init__(self, r, parent):
+        super(Run, self).__init__(parent)
         self._r = r
 
     def add_break(self, break_type=WD_BREAK.LINE):
diff --git a/features/steps/text.py b/features/steps/text.py
@@ -57,7 +57,7 @@ def given_a_run_having_mixed_text_content(context):
           <w:t>jkl</w:t>
         </w:r>""" % nsdecls('w')
     r = parse_xml(r_xml)
-    context.run = Run(r)
+    context.run = Run(r, None)
 
 
 @given('a run having {underline_type} underline')
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -24,7 +24,9 @@ class DescribeParagraph(object):
     def it_provides_access_to_the_runs_it_contains(self, runs_fixture):
         paragraph, Run_, r_, r_2_, run_, run_2_ = runs_fixture
         runs = paragraph.runs
-        assert Run_.mock_calls == [call(r_), call(r_2_)]
+        assert Run_.mock_calls == [
+            call(r_, paragraph), call(r_2_, paragraph)
+        ]
         assert runs == [run_, run_2_]
 
     def it_can_add_a_run_to_itself(self, add_run_fixture):
@@ -308,7 +310,7 @@ def it_can_replace_the_text_it_contains(self, text_set_fixture):
     ])
     def add_break_fixture(self, request):
         break_type, expected_cxml = request.param
-        run = Run(element('w:r'))
+        run = Run(element('w:r'), None)
         expected_xml = xml(expected_cxml)
         return run, break_type, expected_xml
 
@@ -317,7 +319,7 @@ def add_break_fixture(self, request):
     ])
     def add_tab_fixture(self, request):
         r_cxml, expected_cxml = request.param
-        run = Run(element(r_cxml))
+        run = Run(element(r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, expected_xml
 
@@ -329,7 +331,7 @@ def add_tab_fixture(self, request):
     ])
     def add_text_fixture(self, request, Text_):
         r_cxml, text, expected_cxml = request.param
-        run = Run(element(r_cxml))
+        run = Run(element(r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, text, expected_xml, Text_
 
@@ -361,7 +363,7 @@ def add_text_fixture(self, request, Text_):
     ])
     def bool_prop_get_fixture(self, request):
         r_cxml, bool_prop_name, expected_value = request.param
-        run = Run(element(r_cxml))
+        run = Run(element(r_cxml), None)
         return run, bool_prop_name, expected_value
 
     @pytest.fixture(params=[
@@ -415,7 +417,7 @@ def bool_prop_get_fixture(self, request):
     ])
     def bool_prop_set_fixture(self, request):
         initial_r_cxml, bool_prop_name, value, expected_cxml = request.param
-        run = Run(element(initial_r_cxml))
+        run = Run(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, bool_prop_name, value, expected_xml
 
@@ -430,7 +432,7 @@ def bool_prop_set_fixture(self, request):
     ])
     def clear_fixture(self, request):
         initial_r_cxml, expected_cxml = request.param
-        run = Run(element(initial_r_cxml))
+        run = Run(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, expected_xml
 
@@ -440,7 +442,7 @@ def clear_fixture(self, request):
     ])
     def style_get_fixture(self, request):
         r_cxml, expected_style = request.param
-        run = Run(element(r_cxml))
+        run = Run(element(r_cxml), None)
         return run, expected_style
 
     @pytest.fixture(params=[
@@ -455,7 +457,7 @@ def style_get_fixture(self, request):
     ])
     def style_set_fixture(self, request):
         initial_r_cxml, new_style, expected_cxml = request.param
-        run = Run(element(initial_r_cxml))
+        run = Run(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, new_style, expected_xml
 
@@ -467,7 +469,7 @@ def style_set_fixture(self, request):
     ])
     def text_get_fixture(self, request):
         r_cxml, expected_text = request.param
-        run = Run(element(r_cxml))
+        run = Run(element(r_cxml), None)
         return run, expected_text
 
     @pytest.fixture(params=[
@@ -479,7 +481,7 @@ def text_get_fixture(self, request):
     def text_set_fixture(self, request):
         new_text, expected_cxml = request.param
         initial_r_cxml = 'w:r/w:t"should get deleted"'
-        run = Run(element(initial_r_cxml))
+        run = Run(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, new_text, expected_xml
 
@@ -493,7 +495,7 @@ def text_set_fixture(self, request):
     ])
     def underline_get_fixture(self, request):
         r_cxml, expected_underline = request.param
-        run = Run(element(r_cxml))
+        run = Run(element(r_cxml), None)
         return run, expected_underline
 
     @pytest.fixture(params=[
@@ -515,14 +517,14 @@ def underline_get_fixture(self, request):
     ])
     def underline_set_fixture(self, request):
         initial_r_cxml, new_underline, expected_cxml = request.param
-        run = Run(element(initial_r_cxml))
+        run = Run(element(initial_r_cxml), None)
         expected_xml = xml(expected_cxml)
         return run, new_underline, expected_xml
 
     @pytest.fixture(params=['foobar', 42, 'single'])
     def underline_raise_fixture(self, request):
         invalid_underline_setting = request.param
-        run = Run(element('w:r/w:rPr'))
+        run = Run(element('w:r/w:rPr'), None)
         return run, invalid_underline_setting
 
     # fixture components ---------------------------------------------
