From 69a22cd213452838ed478367d46705f8fda3752d Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 19 Feb 2017 20:34:08 +0000 Subject: Remove read() from BodyReader --- mammoth/docx/body_xml.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'mammoth') diff --git a/mammoth/docx/body_xml.py b/mammoth/docx/body_xml.py index 6c2c501..e8315ac 100644 --- a/mammoth/docx/body_xml.py +++ b/mammoth/docx/body_xml.py @@ -18,7 +18,7 @@ def reader(numbering=None, if styles is None: styles = Styles({}, {}) - read, read_all = _create_reader( + read_all = _create_reader( numbering=numbering, content_types=content_types, relationships=relationships, @@ -26,23 +26,14 @@ def reader(numbering=None, docx_file=docx_file, files=files, ) - return _BodyReader(read, read_all) + return _BodyReader(read_all) class _BodyReader(object): - def __init__(self, read, read_all): - self._read = read + def __init__(self, read_all): self._read_all = read_all - def read(self, element): - result = self._read(element) - if result.elements: - element = result.elements[0] - else: - element = None - return results.Result(element, result.messages) - def read_all(self, elements): result = self._read_all(elements) return results.Result(result.elements, result.messages) @@ -407,7 +398,7 @@ def _create_reader(numbering, content_types, relationships, styles, docx_file, f elements = filter(lambda node: isinstance(node, XmlElement), nodes) return _ReadResult.concat(lists.map(read, elements)) - return read, _read_xml_elements + return _read_xml_elements def _inner_text(node): -- cgit v1.2.3