From 963a2100638ade06301491ec7937788db4adc1c4 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 27 May 2013 11:13:16 +0200 Subject: [PATCH] Minor fixes after the Python 3 merge. --- compressor/parser/html5lib.py | 2 +- compressor/tests/test_parsers.py | 1 - tox.ini | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/compressor/parser/html5lib.py b/compressor/parser/html5lib.py index 2113983..eb0d28f 100644 --- a/compressor/parser/html5lib.py +++ b/compressor/parser/html5lib.py @@ -50,7 +50,7 @@ class Html5LibParser(ParserBase): return elem.attrib def elem_content(self, elem): - return smart_unicode(elem.text) + return smart_text(elem.text) def elem_name(self, elem): if '}' in elem.tag: diff --git a/compressor/tests/test_parsers.py b/compressor/tests/test_parsers.py index 364b7b6..a2dc3dd 100644 --- a/compressor/tests/test_parsers.py +++ b/compressor/tests/test_parsers.py @@ -126,7 +126,6 @@ class Html5LibParserTests(ParserTestCase, CompressorTestCase): settings.COMPRESS_PRECOMPILERS = precompilers - @ut2.skipIf(BeautifulSoup is None, 'BeautifulSoup not found') class BeautifulSoupParserTests(ParserTestCase, CompressorTestCase): parser_cls = 'compressor.parser.BeautifulSoupParser' diff --git a/tox.ini b/tox.ini index 6cf4f1f..95e8031 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,6 @@ three = lxml BeautifulSoup4 - [tox] envlist = py33-1.5.X,