aboutsummaryrefslogtreecommitdiff
path: root/tests/docx
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-05-20 19:53:34 +0100
committerMichael Williamson <mike@zwobble.org>2023-05-20 19:53:34 +0100
commit60c62e4fe17e42b9732816344c78b6a68f9b6c7f (patch)
tree4fed9dc3dbb36a22702699a9e885f8f4ed9963a4 /tests/docx
parent97162dd1dbf804f633f8e2c7c508f6e7bebee72d (diff)
Remove _read_and_get_document_xml()
Diffstat (limited to 'tests/docx')
-rw-r--r--tests/docx/body_xml_tests.py25
1 files changed, 8 insertions, 17 deletions
diff --git a/tests/docx/body_xml_tests.py b/tests/docx/body_xml_tests.py
index badd5b8..2459f4a 100644
--- a/tests/docx/body_xml_tests.py
+++ b/tests/docx/body_xml_tests.py
@@ -1177,24 +1177,14 @@ def test_text_nodes_are_ignored_when_reading_children():
_read_and_get_document_xml_element(element)
)
-def _read_and_get_document_xml_element(*args, **kwargs):
- return _read_and_get_document_xml(
- lambda reader, element: reader.read_all([element]).map(single),
- *args,
- **kwargs)
+def _read_and_get_document_xml_element(element, **kwargs):
+ elements = _read_and_get_document_xml_elements(element, **kwargs)
+ return single(elements)
-def _read_and_get_document_xml_elements(*args, **kwargs):
- return _read_and_get_document_xml(
- lambda reader, element: reader.read_all([element]),
- *args,
- **kwargs)
-
-
-def _read_and_get_document_xml(func, *args, **kwargs):
- numbering = kwargs.pop("numbering", Numbering.EMPTY)
- styles = kwargs.pop("styles", FakeStyles())
- result = _read_document_xml(func, *args, numbering=numbering, styles=styles, **kwargs)
+def _read_and_get_document_xml_elements(element, **kwargs):
+ reader = _create_body_reader(**kwargs)
+ result = reader.read_all([element])
assert_equal([], result.messages)
return result.value
@@ -1211,7 +1201,8 @@ def _read_document_xml(func, element, **kwargs):
def _create_body_reader(**kwargs):
numbering = kwargs.pop("numbering", Numbering.EMPTY)
- return body_xml.reader(numbering=numbering, **kwargs)
+ styles = kwargs.pop("styles", FakeStyles())
+ return body_xml.reader(numbering=numbering, styles=styles, **kwargs)