From ce1a99cc7cfa9f1fc39804848d97f18c039d175d Mon Sep 17 00:00:00 2001
From: Daniel <kingdread@gmx.de>
Date: Mon, 5 Oct 2015 11:52:04 +0200
Subject: [PATCH] Remove cssutils from mhtml.py

---
 qutebrowser/browser/mhtml.py     | 66 ++++++--------------------------
 requirements.txt                 |  1 -
 tests/unit/browser/test_mhtml.py |  8 +---
 3 files changed, 12 insertions(+), 63 deletions(-)

diff --git a/qutebrowser/browser/mhtml.py b/qutebrowser/browser/mhtml.py
index 184465b89..54eaaa4f0 100644
--- a/qutebrowser/browser/mhtml.py
+++ b/qutebrowser/browser/mhtml.py
@@ -35,10 +35,6 @@ from PyQt5.QtCore import QUrl
 from qutebrowser.browser import webelem
 from qutebrowser.utils import log, objreg, message, usertypes
 
-try:
-    import cssutils
-except ImportError:
-    cssutils = None
 
 _File = collections.namedtuple('_File',
                                ['content', 'content_type', 'content_location',
@@ -54,52 +50,6 @@ _CSS_URL_PATTERNS = [re.compile(x) for x in [
 ]]
 
 
-def _get_css_imports_regex(data):
-    """Return all assets that are referenced in the given CSS document.
-
-    The returned URLs are relative to the stylesheet's URL.
-
-    Args:
-        data: The content of the stylesheet to scan as string.
-    """
-    urls = []
-    for pattern in _CSS_URL_PATTERNS:
-        for match in pattern.finditer(data):
-            url = match.group("url")
-            if url:
-                urls.append(url)
-    return urls
-
-
-def _get_css_imports_cssutils(data, inline=False):
-    """Return all assets that are referenced in the given CSS document.
-
-    The returned URLs are relative to the stylesheet's URL.
-
-    Args:
-        data: The content of the stylesheet to scan as string.
-        inline: True if the argument is a inline HTML style attribute.
-    """
-    # We don't care about invalid CSS data, this will only litter the log
-    # output with CSS errors
-    parser = cssutils.CSSParser(loglevel=100,
-                                fetcher=lambda url: (None, ""), validate=False)
-    if not inline:
-        sheet = parser.parseString(data)
-        return list(cssutils.getUrls(sheet))
-    else:
-        urls = []
-        declaration = parser.parseStyle(data)
-        # prop = background, color, margin, ...
-        for prop in declaration:
-            # value = red, 10px, url(foobar), ...
-            for value in prop.propertyValue:
-                if isinstance(value, cssutils.css.URIValue):
-                    if value.uri:
-                        urls.append(value.uri)
-        return urls
-
-
 def _get_css_imports(data, inline=False):
     """Return all assets that are referenced in the given CSS document.
 
@@ -107,12 +57,18 @@ def _get_css_imports(data, inline=False):
 
     Args:
         data: The content of the stylesheet to scan as string.
-        inline: True if the argument is a inline HTML style attribute.
+        inline: True if data is a HTML inline style (style="...").
     """
-    if cssutils is None:
-        return _get_css_imports_regex(data)
-    else:
-        return _get_css_imports_cssutils(data, inline)
+    # We keep the inline argument to stay consistent with the cssutils
+    # interface, in case we reintroduce cssutils.
+    # pylint: disable=unused-argument
+    urls = []
+    for pattern in _CSS_URL_PATTERNS:
+        for match in pattern.finditer(data):
+            url = match.group("url")
+            if url:
+                urls.append(url)
+    return urls
 
 
 MHTMLPolicy = email.policy.default.clone(linesep='\r\n', max_line_length=0)
diff --git a/requirements.txt b/requirements.txt
index 9e07256bd..fd5f81a0b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,3 @@ pyPEG2==2.15.2
 PyYAML==3.11
 colorama==0.3.3
 colorlog==2.6.0
-cssutils==1.0
diff --git a/tests/unit/browser/test_mhtml.py b/tests/unit/browser/test_mhtml.py
index 71c6ca2d6..06276ae6a 100644
--- a/tests/unit/browser/test_mhtml.py
+++ b/tests/unit/browser/test_mhtml.py
@@ -250,7 +250,6 @@ def test_removing_file_from_mhtml(checker):
         """)
 
 
-@pytest.mark.parametrize('has_cssutils', [True, False])
 @pytest.mark.parametrize('inline, style, expected_urls', [
     (False, "@import 'default.css'", ['default.css']),
     (False, '@import "default.css"', ['default.css']),
@@ -262,12 +261,7 @@ def test_removing_file_from_mhtml(checker):
     (True, 'background: url(folder/file.png) no-repeat', ['folder/file.png']),
     (True, 'content: url()', []),
 ])
-def test_css_url_scanner(monkeypatch, has_cssutils, inline, style,
-                         expected_urls):
-    if has_cssutils:
-        assert mhtml.cssutils is not None
-    else:
-        monkeypatch.setattr('qutebrowser.browser.mhtml.cssutils', None)
+def test_css_url_scanner(monkeypatch, inline, style, expected_urls):
     expected_urls.sort()
     urls = mhtml._get_css_imports(style, inline=inline)
     urls.sort()