Merge pull request #23 from OpenScienceFramework/issue_23

jlward · jlward · commit 9b6461d149c2 · 2013-05-17T09:48:05.000-07:00
Deleted text in a list breaks setting of list attributes
diff --git a/pydocx/DocxParser.py b/pydocx/DocxParser.py
@@ -202,6 +202,9 @@ def _set_list_attributes(self, el):
         list_elements = el.find_all('numId')
         for li in list_elements:
             parent = li.find_ancestor_with_tag('p')
+            # Deleted text in a list will have a numId but no ilvl.
+            if parent.find_first('ilvl') is None:
+                continue
             parent.is_list_item = True
             parent.num_id = parent.find_first('numId').attrib['val']
             parent.ilvl = parent.find_first('ilvl').attrib['val']
diff --git a/pydocx/tests/templates/p.xml b/pydocx/tests/templates/p.xml
@@ -3,8 +3,12 @@
 		<w:pStyle w:val="style0"/>
 		{% if is_list %}
 		<w:numPr>
+			{% if ilvl != None %}
 			<w:ilvl w:val="{{ ilvl }}"/>
+			{% endif %}
+			{% if numId != None %}
 			<w:numId w:val="{{ numId }}"/>
+			{% endif %}
 		</w:numPr>
 		{% endif %}
 	</w:pPr>
diff --git a/pydocx/tests/test_xml.py b/pydocx/tests/test_xml.py
@@ -716,3 +716,30 @@ def get_xml(self):
 
         xml = DXB.xml(body)
         return xml
+
+
+class MissingIlvl(_TranslationTestCase):
+    expected_output = '''
+    <html><body>
+        <ol data-list-type="decimal">
+            <li>AAA<br/>
+                BBB
+            </li>
+            <li>CCC</li>
+        </ol>
+    </body></html>
+    '''
+
+    def get_xml(self):
+        li_text = [
+            ('AAA', 0, 1),
+            ('BBB', None, 1),  # Because why not.
+            ('CCC', 0, 1),
+        ]
+        lis = ''
+        for text, ilvl, numId in li_text:
+            lis += DXB.li(text=text, ilvl=ilvl, numId=numId)
+        body = lis
+
+        xml = DXB.xml(body)
+        return xml
