Move webkit.http to webkit.httpheaders

flake8 got a new warning about a module name shadowing a builtin module: gforcada/flake8-builtins#121

Probably would have been safe enough to ignore it. But I don't think
moving it is that hard anyway. Hopefully I didn't miss anything!

qutebrowser/browser/qtnetworkdownloads.py

@@ -19,7 +19,7 @@
 from qutebrowser.utils import message, usertypes, log, urlutils, utils, debug, objreg, qtlog
 from qutebrowser.misc import quitter
 from qutebrowser.browser import downloads
-from qutebrowser.browser.webkit import http
+from qutebrowser.browser.webkit import httpheaders
 from qutebrowser.browser.webkit.network import networkmanager
 
 
@@ -533,7 +533,7 @@ def fetch(self, reply, *, target=None, auto_remove=False,
             try:
                 suggested_filename = target.suggested_filename()
             except downloads.NoFilenameError:
-                _, suggested_filename = http.parse_content_disposition(reply)
+                _, suggested_filename = httpheaders.parse_content_disposition(reply)
         log.downloads.debug("fetch: {} -> {}".format(reply.url(),
                                                      suggested_filename))
         download = DownloadItem(reply, manager=self)

qutebrowser/browser/webkit/webpage.py

@@ -18,7 +18,7 @@
 
 from qutebrowser.config import websettings, config
 from qutebrowser.browser import pdfjs, shared, downloads, greasemonkey
-from qutebrowser.browser.webkit import http
+from qutebrowser.browser.webkit import httpheaders
 from qutebrowser.browser.webkit.network import networkmanager
 from qutebrowser.utils import message, usertypes, log, jinja, objreg
 from qutebrowser.qt import sip
@@ -263,14 +263,14 @@ def on_unsupported_content(self, reply):
         At some point we might want to implement the MIME Sniffing standard
         here: https://mimesniff.spec.whatwg.org/
         """
-        inline, suggested_filename = http.parse_content_disposition(reply)
+        inline, suggested_filename = httpheaders.parse_content_disposition(reply)
         download_manager = objreg.get('qtnetwork-download-manager')
         if not inline:
             # Content-Disposition: attachment -> force download
             download_manager.fetch(reply,
                                    suggested_filename=suggested_filename)
             return
-        mimetype, _rest = http.parse_content_type(reply)
+        mimetype, _rest = httpheaders.parse_content_type(reply)
         if mimetype == 'image/jpg':
             # Some servers (e.g. the LinkedIn CDN) send a non-standard
             # image/jpg (instead of image/jpeg, defined in RFC 1341 section

scripts/dev/check_coverage.py

@@ -73,8 +73,8 @@ class MsgType(enum.Enum):
      'qutebrowser/browser/history.py'),
     ('tests/unit/browser/test_pdfjs.py',
      'qutebrowser/browser/pdfjs.py'),
-    ('tests/unit/browser/webkit/http/test_http.py',
-     'qutebrowser/browser/webkit/http.py'),
+    ('tests/unit/browser/webkit/http/test_httpheaders.py',
+     'qutebrowser/browser/webkit/httpheaders.py'),
     # ('tests/unit/browser/webkit/test_webkitelem.py',
     #  'qutebrowser/browser/webkit/webkitelem.py'),
     # ('tests/unit/browser/webkit/test_webkitelem.py',

tests/unit/browser/webkit/http/test_content_disposition.py

@@ -6,7 +6,7 @@
 
 import pytest
 
-from qutebrowser.browser.webkit import http
+from qutebrowser.browser.webkit import httpheaders
 
 
 DEFAULT_NAME = 'qutebrowser-download'
@@ -30,7 +30,7 @@ def check_filename(self, header, filename, expected_inline=False):
         """Check if the passed header has the given filename."""
         reply = self.stubs.FakeNetworkReply(
             headers={'Content-Disposition': header})
-        cd_inline, cd_filename = http.parse_content_disposition(reply)
+        cd_inline, cd_filename = httpheaders.parse_content_disposition(reply)
         assert cd_filename is not None
         assert cd_filename == filename
         assert cd_inline == expected_inline
@@ -40,15 +40,15 @@ def check_ignored(self, header):
         reply = self.stubs.FakeNetworkReply(
             headers={'Content-Disposition': header})
         with self.caplog.at_level(logging.ERROR, 'network'):
-            cd_inline, cd_filename = http.parse_content_disposition(reply)
+            cd_inline, cd_filename = httpheaders.parse_content_disposition(reply)
         assert cd_filename == DEFAULT_NAME
         assert cd_inline
 
     def check_unnamed(self, header):
         """Check if the passed header results in an unnamed attachment."""
         reply = self.stubs.FakeNetworkReply(
             headers={'Content-Disposition': header})
-        cd_inline, cd_filename = http.parse_content_disposition(reply)
+        cd_inline, cd_filename = httpheaders.parse_content_disposition(reply)
         assert cd_filename == DEFAULT_NAME
         assert not cd_inline
 
@@ -164,7 +164,7 @@ def test_attonly(self, stubs):
         """
         reply = stubs.FakeNetworkReply(
             headers={'Content-Disposition': 'attachment'})
-        cd_inline, cd_filename = http.parse_content_disposition(reply)
+        cd_inline, cd_filename = httpheaders.parse_content_disposition(reply)
         assert not cd_inline
         assert cd_filename == DEFAULT_NAME
 

tests/unit/browser/webkit/http/test_http.py → tests/unit/browser/webkit/http/test_httpheaders.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-"""Tests for qutebrowser.browser.webkit.http."""
+"""Tests for qutebrowser.browser.webkit.httpheaders."""
 
 import logging
 
@@ -11,7 +11,7 @@
 from hypothesis import strategies
 from qutebrowser.qt.core import QUrl
 
-from qutebrowser.browser.webkit import http
+from qutebrowser.browser.webkit import httpheaders
 
 
 @pytest.mark.parametrize('url, expected', [
@@ -24,7 +24,7 @@
 ])
 def test_no_content_disposition(stubs, url, expected):
     reply = stubs.FakeNetworkReply(url=QUrl(url))
-    inline, filename = http.parse_content_disposition(reply)
+    inline, filename = httpheaders.parse_content_disposition(reply)
     assert inline
     assert filename == expected
 
@@ -40,8 +40,8 @@ def test_no_content_disposition(stubs, url, expected):
     # dropping QtWebKit.
 ])
 def test_parse_content_disposition_invalid(value):
-    with pytest.raises(http.ContentDispositionError):
-        http.ContentDisposition.parse(value)
+    with pytest.raises(httpheaders.ContentDispositionError):
+        httpheaders.ContentDisposition.parse(value)
 
 
 @pytest.mark.parametrize('template', [
@@ -58,16 +58,16 @@ def test_parse_content_disposition_hypothesis(caplog, template, stubs, s):
     header = template.format(s)
     reply = stubs.FakeNetworkReply(headers={'Content-Disposition': header})
     with caplog.at_level(logging.ERROR, 'network'):
-        http.parse_content_disposition(reply)
+        httpheaders.parse_content_disposition(reply)
 
 
 @hypothesis.given(strategies.binary())
 def test_content_disposition_directly_hypothesis(s):
     """Test rfc6266 parsing directly with binary data."""
     try:
-        cd = http.ContentDisposition.parse(s)
+        cd = httpheaders.ContentDisposition.parse(s)
         cd.filename()
-    except http.ContentDispositionError:
+    except httpheaders.ContentDispositionError:
         pass
 
 
@@ -83,12 +83,12 @@ def test_parse_content_type(stubs, content_type, expected_mimetype,
         reply = stubs.FakeNetworkReply()
     else:
         reply = stubs.FakeNetworkReply(headers={'Content-Type': content_type})
-    mimetype, rest = http.parse_content_type(reply)
+    mimetype, rest = httpheaders.parse_content_type(reply)
     assert mimetype == expected_mimetype
     assert rest == expected_rest
 
 
 @hypothesis.given(strategies.text())
 def test_parse_content_type_hypothesis(stubs, s):
     reply = stubs.FakeNetworkReply(headers={'Content-Type': s})
-    http.parse_content_type(reply)
+    httpheaders.parse_content_type(reply)