From aa2b4f6e67da4ae3a43ffb95321e610fc1e08157 Mon Sep 17 00:00:00 2001 From: souliane Date: Thu, 21 Aug 2014 20:45:24 +0200 Subject: [PATCH] test, setup: requires lxml >= 3.1.0 (fixes html cleaning issue) --- README4PACKAGERS | 2 +- setup.py | 2 +- src/test/test_plugin_misc_text_syntaxes.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README4PACKAGERS b/README4PACKAGERS index d887a45b..99d66ed0 100644 --- a/README4PACKAGERS +++ b/README4PACKAGERS @@ -13,7 +13,7 @@ Dependencies for SàT's backend ------------------------------ dbus -lxml +lxml >= 3.1.0 Mutagen pillow PyCrypto >= 2.6.1 diff --git a/setup.py b/setup.py index d493b4f8..db623a32 100644 --- a/setup.py +++ b/setup.py @@ -308,6 +308,6 @@ setup(name=NAME, scripts=['frontends/src/jp/jp', 'frontends/src/primitivus/primitivus', ], zip_safe=False, dependency_links=['http://home.avvanta.com/%7Esteveha/pyfeed-0.7.4.tar.gz', 'http://home.avvanta.com/%7Esteveha/xe-0.7.4.tar.gz'], - install_requires=['twisted', 'wokkel >= 0.7.1', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.4.0', 'pyfeed', 'xe', 'mutagen', 'pillow', 'lxml', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr', 'PyOpenSSL'], + install_requires=['twisted', 'wokkel >= 0.7.1', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.4.0', 'pyfeed', 'xe', 'mutagen', 'pillow', 'lxml >= 3.1.0', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr', 'PyOpenSSL'], cmdclass={'install': CustomInstall}, ) # XXX: wxpython doesn't work, it's managed with preinstall_check diff --git a/src/test/test_plugin_misc_text_syntaxes.py b/src/test/test_plugin_misc_text_syntaxes.py index d9bb6b5d..372e6b4c 100644 --- a/src/test/test_plugin_misc_text_syntaxes.py +++ b/src/test/test_plugin_misc_text_syntaxes.py @@ -100,7 +100,7 @@ class SanitisationTest(helpers.SatTestCase): return d def test_removeXHTMLMarkups(self): - expected = u""" a link another link a paragraph secret EVIL! of EVIL! Password: annoying EVIL!spam spam SPAM! """ + expected = u""" a link another link a paragraph secret EVIL! of EVIL! Password: annoying EVIL! spam spam SPAM! """ result = self.text_syntaxes._removeMarkups(self.EVIL_HTML1) self.assertEqual(re.sub(r"\s+", " ", result).rstrip(), expected.rstrip())