txt: base Paragraph on Parented

Steve Canny · Steve Canny · commit f01a873b4e88 · 2014-07-11T17:32:35.000-07:00
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -127,7 +127,7 @@ def add_paragraph(self):
         Return a paragraph newly added to the end of body content.
         """
         p = self._body.add_p()
-        return Paragraph(p)
+        return Paragraph(p, self)
 
     def add_table(self, rows, cols):
         """
@@ -153,7 +153,7 @@ def clear_content(self):
 
     @property
     def paragraphs(self):
-        return [Paragraph(p) for p in self._body.p_lst]
+        return [Paragraph(p, self) for p in self._body.p_lst]
 
     @property
     def tables(self):
diff --git a/docx/table.py b/docx/table.py
@@ -94,7 +94,7 @@ def paragraphs(self):
         at least one block-level element. By default this is a single
         paragraph.
         """
-        return [Paragraph(p) for p in self._tc.p_lst]
+        return [Paragraph(p, self) for p in self._tc.p_lst]
 
     @write_only_property
     def text(self, text):
diff --git a/docx/text.py b/docx/text.py
@@ -6,7 +6,8 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-from docx.enum.text import WD_BREAK
+from .enum.text import WD_BREAK
+from .shared import Parented
 
 
 def boolproperty(f):
@@ -54,12 +55,12 @@ def setter(obj, value):
     return property(getter, setter, doc=f.__doc__)
 
 
-class Paragraph(object):
+class Paragraph(Parented):
     """
     Proxy object wrapping ``<w:p>`` element.
     """
-    def __init__(self, p):
-        super(Paragraph, self).__init__()
+    def __init__(self, p, parent):
+        super(Paragraph, self).__init__(parent)
         self._p = p
 
     def add_run(self, text=None, style=None):
@@ -110,7 +111,7 @@ def insert_paragraph_before(self, text=None, style=None):
         to the new paragraph.
         """
         p = self._p.add_p_before()
-        paragraph = Paragraph(p)
+        paragraph = Paragraph(p, self._parent)
         if text:
             paragraph.add_run(text)
         if style is not None:
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
@@ -54,7 +54,7 @@ def given_a_paragraph_with_content_and_formatting(context):
           </w:r>
         </w:p>""" % (nsdecls('w'), TEST_STYLE)
     p = parse_xml(p_xml)
-    context.paragraph = Paragraph(p)
+    context.paragraph = Paragraph(p, None)
 
 
 # when ====================================================
diff --git a/tests/test_text.py b/tests/test_text.py
@@ -90,7 +90,7 @@ def it_can_remove_its_content_while_preserving_formatting(
     ])
     def add_run_fixture(self, request):
         before_cxml, text, style, after_cxml = request.param
-        paragraph = Paragraph(element(before_cxml))
+        paragraph = Paragraph(element(before_cxml), None)
         expected_xml = xml(after_cxml)
         return paragraph, text, style, expected_xml
 
@@ -100,7 +100,7 @@ def add_run_fixture(self, request):
     ])
     def alignment_get_fixture(self, request):
         cxml, expected_alignment_value = request.param
-        paragraph = Paragraph(element(cxml))
+        paragraph = Paragraph(element(cxml), None)
         return paragraph, expected_alignment_value
 
     @pytest.fixture(params=[
@@ -114,7 +114,7 @@ def alignment_get_fixture(self, request):
     ])
     def alignment_set_fixture(self, request):
         initial_cxml, new_alignment_value, expected_cxml = request.param
-        paragraph = Paragraph(element(initial_cxml))
+        paragraph = Paragraph(element(initial_cxml), None)
         expected_xml = xml(expected_cxml)
         return paragraph, new_alignment_value, expected_xml
 
@@ -126,7 +126,7 @@ def alignment_set_fixture(self, request):
     ])
     def clear_fixture(self, request):
         initial_cxml, expected_cxml = request.param
-        paragraph = Paragraph(element(initial_cxml))
+        paragraph = Paragraph(element(initial_cxml), None)
         expected_xml = xml(expected_cxml)
         return paragraph, expected_xml
 
@@ -137,13 +137,13 @@ def clear_fixture(self, request):
     def insert_before_fixture(self, request):
         body_cxml, text, style, expected_cxml = request.param
         body = element(body_cxml)
-        paragraph = Paragraph(body.find(qn('w:p')))
+        paragraph = Paragraph(body.find(qn('w:p')), None)
         expected_xml = xml(expected_cxml)
         return paragraph, text, style, body, expected_xml
 
     @pytest.fixture
     def runs_fixture(self, p_, Run_, r_, r_2_, runs_):
-        paragraph = Paragraph(p_)
+        paragraph = Paragraph(p_, None)
         run_, run_2_ = runs_
         return paragraph, Run_, r_, r_2_, run_, run_2_
 
@@ -154,7 +154,7 @@ def runs_fixture(self, p_, Run_, r_, r_2_, runs_):
     ])
     def style_get_fixture(self, request):
         p_cxml, expected_style = request.param
-        paragraph = Paragraph(element(p_cxml))
+        paragraph = Paragraph(element(p_cxml), None)
         return paragraph, expected_style
 
     @pytest.fixture(params=[
@@ -171,7 +171,7 @@ def style_get_fixture(self, request):
     ])
     def style_set_fixture(self, request):
         p_cxml, new_style_value, expected_cxml = request.param
-        paragraph = Paragraph(element(p_cxml))
+        paragraph = Paragraph(element(p_cxml), None)
         expected_xml = xml(expected_cxml)
         return paragraph, new_style_value, expected_xml
 
@@ -188,12 +188,12 @@ def style_set_fixture(self, request):
     ])
     def text_get_fixture(self, request):
         p_cxml, expected_text_value = request.param
-        paragraph = Paragraph(element(p_cxml))
+        paragraph = Paragraph(element(p_cxml), None)
         return paragraph, expected_text_value
 
     @pytest.fixture
     def text_set_fixture(self):
-        paragraph = Paragraph(element('w:p'))
+        paragraph = Paragraph(element('w:p'), None)
         paragraph.add_run('must not appear in result')
         new_text_value = 'foo\tbar\rbaz\n'
         expected_text_value = 'foo\tbar\nbaz\n'
