summaryrefslogtreecommitdiff
path: root/qutebrowser
diff options
context:
space:
mode:
authortoofar <toofar@spalge.com>2024-04-09 08:09:31 +1200
committertoofar <toofar@spalge.com>2024-04-09 08:09:31 +1200
commit98421e3c3519cca40704e293168289a7aa4ddade (patch)
tree43519d3c447bdb67e760bf71a0f676f57c802014 /qutebrowser
parent4a12ae78049abb94703215982fc0a05424d39cbb (diff)
downloadqutebrowser-98421e3c3519cca40704e293168289a7aa4ddade.tar.gz
qutebrowser-98421e3c3519cca40704e293168289a7aa4ddade.zip
Move webkit.http to webkit.httpheaders
flake8 got a new warning about a module name shadowing a builtin module: https://github.com/gforcada/flake8-builtins/pull/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!
Diffstat (limited to 'qutebrowser')
-rw-r--r--qutebrowser/browser/qtnetworkdownloads.py4
-rw-r--r--qutebrowser/browser/webkit/httpheaders.py (renamed from qutebrowser/browser/webkit/http.py)0
-rw-r--r--qutebrowser/browser/webkit/webpage.py6
3 files changed, 5 insertions, 5 deletions
diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py
index 9dd507ab5..0360eed66 100644
--- a/qutebrowser/browser/qtnetworkdownloads.py
+++ b/qutebrowser/browser/qtnetworkdownloads.py
@@ -19,7 +19,7 @@ from qutebrowser.config import config, websettings
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 @@ class DownloadManager(downloads.AbstractDownloadManager):
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)
diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/httpheaders.py
index 95b7b7104..95b7b7104 100644
--- a/qutebrowser/browser/webkit/http.py
+++ b/qutebrowser/browser/webkit/httpheaders.py
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index ea19174ec..595432dc9 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -18,7 +18,7 @@ from qutebrowser.qt.webkitwidgets import QWebPage, QWebFrame
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 @@ class BrowserPage(QWebPage):
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