From 7a9484ee7f85a0c986f620c5d3cbbd2b11d28df8 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 1 Dec 2013 20:29:00 +0000 Subject: Add better Python 3 support --- mammoth/docx/document_xml.py | 3 ++- mammoth/lists.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 mammoth/lists.py (limited to 'mammoth') diff --git a/mammoth/docx/document_xml.py b/mammoth/docx/document_xml.py index f8fb962..8e8dda8 100644 --- a/mammoth/docx/document_xml.py +++ b/mammoth/docx/document_xml.py @@ -1,5 +1,6 @@ from .. import documents from .. import results +from .. import lists from .xmlparser import node_types @@ -105,7 +106,7 @@ def _create_reader(numbering): def _read_xml_elements(elements): return results.combine(map(read, elements)) \ - .map(lambda values: filter(None, values)) + .map(lambda values: lists.filter(None, values)) return read diff --git a/mammoth/lists.py b/mammoth/lists.py new file mode 100644 index 0000000..24fa7c4 --- /dev/null +++ b/mammoth/lists.py @@ -0,0 +1,11 @@ +import sys + + +__all__ = ["filter"] + +if sys.version_info[0] == 2: + filter = filter +else: + import builtins + def filter(*args, **kwargs): + return list(builtins.filter(*args, **kwargs)) -- cgit v1.2.3