txt: replace Paragraph.style setter

Steve Canny · Steve Canny · commit 4f3bcc7409d6 · 2015-02-08T00:01:15.000-08:00
* place api-add-heading.feature back into WIP until Paragraph.style
reimplementation is completed
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -74,6 +74,16 @@ def get_style(self, style_id, style_type):
         """
         return self.styles.get_by_id(style_id, style_type)
 
+    def get_style_id(self, style_or_name, style_type):
+        """
+        Return the style_id (|str|) of the style of *style_type* matching
+        *style_or_name*. Returns |None| if the style resolves to the default
+        style for *style_type* or if *style_or_name* is itself |None|. Raises
+        if *style_or_name* is a style of the wrong type or names a style not
+        present in the document.
+        """
+        raise NotImplementedError
+
     @lazyproperty
     def inline_shapes(self):
         """
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
@@ -90,8 +90,11 @@ def style(self):
         return self.part.get_style(style_id, WD_STYLE_TYPE.PARAGRAPH)
 
     @style.setter
-    def style(self, style):
-        self._p.style = None if style == 'Normal' else style
+    def style(self, style_or_name):
+        style_id = self.part.get_style_id(
+            style_or_name, WD_STYLE_TYPE.PARAGRAPH
+        )
+        self._p.style = style_id
 
     @property
     def text(self):
diff --git a/features/api-add-heading.feature b/features/api-add-heading.feature
@@ -3,12 +3,16 @@ Feature: Add a section heading with text
   As a programmer using the basic python-docx API
   I need a method to add a heading with its text in a single step
 
+
+  @wip
   Scenario: Add a heading specifying only its text
     Given a document
      When I add a heading specifying only its text
      Then the style of the last paragraph is 'Heading 1'
       And the last paragraph contains the heading text
 
+
+  @wip
   Scenario Outline: Add a heading specifying level
     Given a document
      When I add a heading specifying level=<heading level>
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
@@ -60,7 +60,12 @@ def it_knows_its_paragraph_style(self, style_get_fixture):
 
     def it_can_change_its_paragraph_style(self, style_set_fixture):
         paragraph, value, expected_xml = style_set_fixture
+
         paragraph.style = value
+
+        paragraph.part.get_style_id.assert_called_once_with(
+            value, WD_STYLE_TYPE.PARAGRAPH
+        )
         assert paragraph._p.xml == expected_xml
 
     def it_knows_the_text_it_contains(self, text_get_fixture):
@@ -192,22 +197,23 @@ def style_get_fixture(self, part_prop_):
         return paragraph, style_id, style_
 
     @pytest.fixture(params=[
-        ('w:p',                                'Heading1',
+        ('w:p',                                 'Heading 1', 'Heading1',
          'w:p/w:pPr/w:pStyle{w:val=Heading1}'),
-        ('w:p/w:pPr',                          'Heading1',
+        ('w:p/w:pPr',                           'Heading 1', 'Heading1',
          'w:p/w:pPr/w:pStyle{w:val=Heading1}'),
-        ('w:p/w:pPr/w:pStyle{w:val=Heading1}', 'Heading2',
+        ('w:p/w:pPr/w:pStyle{w:val=Heading1}',  'Heading 2', 'Heading2',
          'w:p/w:pPr/w:pStyle{w:val=Heading2}'),
-        ('w:p/w:pPr/w:pStyle{w:val=Heading1}', None,
+        ('w:p/w:pPr/w:pStyle{w:val=Heading1}',  'Normal',    None,
          'w:p/w:pPr'),
-        ('w:p',                                None,
+        ('w:p',                                 None,        None,
          'w:p/w:pPr'),
     ])
-    def style_set_fixture(self, request):
-        p_cxml, new_style_value, expected_cxml = request.param
+    def style_set_fixture(self, request, part_prop_):
+        p_cxml, value, style_id, expected_cxml = request.param
         paragraph = Paragraph(element(p_cxml), None)
+        part_prop_.return_value.get_style_id.return_value = style_id
         expected_xml = xml(expected_cxml)
-        return paragraph, new_style_value, expected_xml
+        return paragraph, value, expected_xml
 
     @pytest.fixture(params=[
         ('w:p', ''),
