From 8dab1cf58ac26655419e6fb0a1aab655771e6fa5 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 5 Oct 2016 09:09:42 +0200 Subject: [PATCH] Fix test_mhtml.py --- tests/unit/browser/webkit/test_mhtml.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/unit/browser/webkit/test_mhtml.py b/tests/unit/browser/webkit/test_mhtml.py index 7ea3d999e..a87b1ad56 100644 --- a/tests/unit/browser/webkit/test_mhtml.py +++ b/tests/unit/browser/webkit/test_mhtml.py @@ -26,6 +26,15 @@ import pytest mhtml = pytest.importorskip('qutebrowser.browser.webkit.mhtml') +try: + import cssutils +except (ImportError, re.error): + # Catching re.error because cssutils in earlier releases (<= 1.0) is + # broken on Python 3.5 + # See https://bitbucket.org/cthedot/cssutils/issues/52 + cssutils = None + + @pytest.fixture(autouse=True) def patch_uuid(monkeypatch): monkeypatch.setattr("uuid.uuid4", lambda: "UUID") @@ -248,8 +257,7 @@ def test_empty_content_type(checker): @pytest.mark.parametrize('has_cssutils', [ - pytest.mark.skipif(mhtml.cssutils is None, - reason="requires cssutils")(True), + pytest.mark.skipif(cssutils is None, reason="requires cssutils")(True), False, ], ids=['with_cssutils', 'no_cssutils']) @pytest.mark.parametrize('inline, style, expected_urls', [