From 329e9277bd77b3bed671bc03778eef3e857e03d6 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 20 Aug 2015 21:23:35 +0100 Subject: Fix Python 3 support --- NEWS | 4 ++++ makefile | 7 +++++-- mammoth/options.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index b251b2d..b4955ce 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +# 0.3.24 + +* Fix Python 3 support. + # 0.3.23 * Support file objects without a name attribute again (broken since 0.3.20). diff --git a/makefile b/makefile index 11e80ed..cfe74d8 100644 --- a/makefile +++ b/makefile @@ -3,8 +3,11 @@ test: _virtualenv/bin/pyflakes mammoth tests sh -c '. _virtualenv/bin/activate; nosetests tests' - -upload: setup assert-converted-readme + +test-all: + tox + +upload: setup assert-converted-readme test-all python setup.py sdist upload make clean diff --git a/mammoth/options.py b/mammoth/options.py index 1909b86..ca40f77 100644 --- a/mammoth/options.py +++ b/mammoth/options.py @@ -14,7 +14,7 @@ def read_options(options): def _read_style_map(style_text): lines = filter(None, map(_get_line, style_text.split("\n"))) return results.combine(lists.map(style_reader.read_style, lines)) \ - .map(lambda style_mappings: filter(None, style_mappings)) + .map(lambda style_mappings: lists.filter(None, style_mappings)) def _get_line(line): -- cgit v1.2.3