oxml: add CT_P.style getter

Steve Canny · Steve Canny · commit 18601f22af0a · 2013-12-20T20:12:40.000-08:00
diff --git a/docx/oxml/text.py b/docx/oxml/text.py
@@ -45,6 +45,14 @@ def r_elms(self):
             return ()
         return tuple([r for r in self.r])
 
+    @property
+    def style(self):
+        """
+        String contained in w:val attribute of <w:pPr><w:pStyle> child, or
+        None if that element is not present.
+        """
+        return self.pPr.style if hasattr(self, 'pPr') else None
+
 
 class CT_PPr(OxmlBaseElement):
     """
diff --git a/tests/oxml/test_text.py b/tests/oxml/test_text.py
@@ -35,6 +35,18 @@ def it_can_add_an_r_to_itself(self):
         assert p.xml == a_p().with_nsdecls().with_r().xml
         assert isinstance(r, CT_R)
 
+    def it_knows_its_paragraph_style(self):
+        # effectively an integration test with CT_PPr
+        pPr = a_pPr().with_style('foobar')
+        cases = (
+            (a_p(), None),
+            (a_p().with_pPr(pPr), 'foobar'),
+        )
+        for builder, expected_value in cases:
+            print builder.with_nsdecls().xml
+            p = builder.with_nsdecls().element
+            assert p.style == expected_value
+
 
 class DescribeCT_PPr(object):
 
diff --git a/tests/unitdata.py b/tests/unitdata.py
@@ -121,11 +121,19 @@ class CT_PBuilder(BaseBuilder):
     def __init__(self):
         """Establish instance variables with default values"""
         super(CT_PBuilder, self).__init__()
+        self._pPr = None
         self._r = []
 
     @property
     def is_empty(self):
-        return len(self._r) == 0
+        return self._pPr is None and len(self._r) == 0
+
+    def with_pPr(self, pPr=None):
+        """Add a <w:pPr> child element"""
+        if pPr is None:
+            pPr = a_pPr()
+        self._pPr = pPr
+        return self
 
     def with_r(self, count=1):
         """Add *count* empty run elements"""
@@ -141,6 +149,8 @@ def xml(self):
             xml = '%s<w:p%s/>\n' % (indent, self._nsdecls)
         else:
             xml = '%s<w:p%s>\n' % (indent, self._nsdecls)
+            if self._pPr:
+                xml += self._pPr.with_indent(self._indent+2).xml
             for r in self._r:
                 xml += r.with_indent(self._indent+2).xml
             xml += '%s</w:p>\n' % indent
