parfmt: add ParagraphFormat.alignment getter

Steve Canny · Steve Canny · commit a07693292851 · 2015-02-08T00:01:42.000-08:00
* rename CT_PPr.alignment =&gt; .jc_val
diff --git a/docx/oxml/text/paragraph.py b/docx/oxml/text/paragraph.py
@@ -46,12 +46,12 @@ def alignment(self):
         pPr = self.pPr
         if pPr is None:
             return None
-        return pPr.alignment
+        return pPr.jc_val
 
     @alignment.setter
     def alignment(self, value):
         pPr = self.get_or_add_pPr()
-        pPr.alignment = value
+        pPr.jc_val = value
 
     def clear_content(self):
         """
@@ -113,7 +113,7 @@ def _insert_pStyle(self, pStyle):
         return pStyle
 
     @property
-    def alignment(self):
+    def jc_val(self):
         """
         The value of the ``<w:jc>`` child element or |None| if not present.
         """
@@ -122,13 +122,12 @@ def alignment(self):
             return None
         return jc.val
 
-    @alignment.setter
-    def alignment(self, value):
+    @jc_val.setter
+    def jc_val(self, value):
         if value is None:
             self._remove_jc()
             return
-        jc = self.get_or_add_jc()
-        jc.val = value
+        self.get_or_add_jc().val = value
 
     @property
     def style(self):
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
@@ -137,3 +137,15 @@ class ParagraphFormat(ElementProxy):
     """
 
     __slots__ = ()
+
+    @property
+    def alignment(self):
+        """
+        A member of the :ref:`WdParagraphAlignment` enumeration specifying
+        the justification setting for this paragraph. A value of |None|
+        indicates paragraph alignment is inherited from the style hierarchy.
+        """
+        pPr = self._element.pPr
+        if pPr is None:
+            return None
+        return pPr.jc_val
diff --git a/features/txt-parfmt-props.feature b/features/txt-parfmt-props.feature
@@ -4,7 +4,6 @@ Feature: Get or set paragraph formatting properties
   I need a ParagraphFormat object with read/write formatting properties
 
 
-  @wip
   Scenario Outline: Get paragraph alignment
     Given a paragraph format having <align-type> alignment
      Then paragraph_format.alignment is <value>
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
@@ -13,7 +13,7 @@
 from docx.oxml.text.paragraph import CT_P
 from docx.oxml.text.run import CT_R
 from docx.parts.document import DocumentPart
-from docx.text.paragraph import Paragraph
+from docx.text.paragraph import Paragraph, ParagraphFormat
 from docx.text.run import Run
 
 import pytest
@@ -283,3 +283,22 @@ def runs_(self, request):
         run_ = instance_mock(request, Run, name='run_')
         run_2_ = instance_mock(request, Run, name='run_2_')
         return run_, run_2_
+
+
+class DescribeParagraphFormat(object):
+
+    def it_knows_its_alignment_value(self, alignment_get_fixture):
+        paragraph_format, expected_value = alignment_get_fixture
+        assert paragraph_format.alignment == expected_value
+
+    # fixtures -------------------------------------------------------
+
+    @pytest.fixture(params=[
+        ('w:p',                          None),
+        ('w:p/w:pPr',                    None),
+        ('w:p/w:pPr/w:jc{w:val=center}', WD_ALIGN_PARAGRAPH.CENTER),
+    ])
+    def alignment_get_fixture(self, request):
+        p_cxml, expected_value = request.param
+        paragraph_format = ParagraphFormat(element(p_cxml))
+        return paragraph_format, expected_value
