diff options
| author | Michael Williamson <mike@zwobble.org> | 2015-08-04 21:58:35 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2015-08-04 21:58:35 +0100 |
| commit | c0f6e3504a5f7c8585a7edf20eadc2dfaaf714c9 (patch) | |
| tree | 85492d4824b2b8311759ba5ab13b7a5d1e26fd24 /mammoth | |
| parent | 718bb4be605da81893daec32c63987e8a546b30c (diff) | |
Handle numbering properties without w:ilvl or w:numId
Diffstat (limited to 'mammoth')
| -rw-r--r-- | mammoth/docx/body_xml.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mammoth/docx/body_xml.py b/mammoth/docx/body_xml.py index 54f9dd3..9588bfe 100644 --- a/mammoth/docx/body_xml.py +++ b/mammoth/docx/body_xml.py @@ -118,11 +118,7 @@ def _create_reader(numbering, content_types, relationships, styles, docx_file, f else: style_name = styles.find_paragraph_style_by_id(style_id).name - numbering_properties = properties.find_child("w:numPr") - if numbering_properties is None: - numbering = None - else: - numbering = _read_numbering_properties(numbering_properties) + numbering = _read_numbering_properties(properties.find_child_or_null("w:numPr")) return _read_xml_elements(element.children) \ .map(lambda children: documents.paragraph( @@ -134,9 +130,12 @@ def _create_reader(numbering, content_types, relationships, styles, docx_file, f .append_extra() def _read_numbering_properties(element): - num_id = element.find_child("w:numId").attributes["w:val"] - level_index = element.find_child("w:ilvl").attributes["w:val"] - return numbering.find_level(num_id, level_index) + num_id = element.find_child_or_null("w:numId").attributes.get("w:val") + level_index = element.find_child_or_null("w:ilvl").attributes.get("w:val") + if num_id is None or level_index is None: + return None + else: + return numbering.find_level(num_id, level_index) @handler("w:tab") |