summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-01-12 12:57:25 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-01-13 20:26:54 +0100
commit4d859c0d2cf914fde8f943bb051d96cdb18ed64d (patch)
tree98a89bf99db1d4cabc1d80a2a0fd36784d74412e
parent124fe5676b37c255c6f97eae70da602c4bc0fcb2 (diff)
downloadqutebrowser-4d859c0d2cf914fde8f943bb051d96cdb18ed64d.tar.gz
qutebrowser-4d859c0d2cf914fde8f943bb051d96cdb18ed64d.zip
dataclasses: Fix lint
See #6023
-rw-r--r--qutebrowser/browser/webengine/interceptor.py13
-rw-r--r--qutebrowser/extensions/loader.py5
2 files changed, 10 insertions, 8 deletions
diff --git a/qutebrowser/browser/webengine/interceptor.py b/qutebrowser/browser/webengine/interceptor.py
index 98798983b..652e4b8ef 100644
--- a/qutebrowser/browser/webengine/interceptor.py
+++ b/qutebrowser/browser/webengine/interceptor.py
@@ -20,7 +20,7 @@
"""A request interceptor taking care of adblocking and custom headers."""
import dataclasses
-from typing import Optional
+from typing import Optional, Set
from PyQt5.QtCore import QUrl, QByteArray
from PyQt5.QtWebEngineCore import (QWebEngineUrlRequestInterceptor,
@@ -33,13 +33,17 @@ from qutebrowser.extensions import interceptors
from qutebrowser.misc import objects
+_WHITELISTED_REQUEST_METHODS: Set[QByteArray] = {
+ QByteArray(b'GET'),
+ QByteArray(b'HEAD'),
+}
+
+
@dataclasses.dataclass
class WebEngineRequest(interceptors.Request):
"""QtWebEngine-specific request interceptor functionality."""
- _WHITELISTED_REQUEST_METHODS = {QByteArray(b'GET'), QByteArray(b'HEAD')}
-
webengine_info: Optional[QWebEngineUrlRequestInfo] = None # FIXME private
#: If this request has been redirected already
_redirected: bool = dataclasses.field(init=False, default=False)
@@ -51,8 +55,7 @@ class WebEngineRequest(interceptors.Request):
raise interceptors.RedirectException("Request improperly initialized.")
# Redirecting a request that contains payload data is not allowed.
# To be safe, abort on any request not in a whitelist.
- if (self.webengine_info.requestMethod()
- not in self._WHITELISTED_REQUEST_METHODS):
+ if self.webengine_info.requestMethod() not in _WHITELISTED_REQUEST_METHODS:
raise interceptors.RedirectException(
"Request method does not support redirection.")
self.webengine_info.redirect(url)
diff --git a/qutebrowser/extensions/loader.py b/qutebrowser/extensions/loader.py
index 066d3b793..a662310e2 100644
--- a/qutebrowser/extensions/loader.py
+++ b/qutebrowser/extensions/loader.py
@@ -59,11 +59,10 @@ class ModuleInfo:
This gets used by qutebrowser.api.hook.
"""
- _ConfigChangedHooksType = List[Tuple[Optional[str], Callable]]
-
skip_hooks: bool = False
init_hook: Optional[Callable] = None
- config_changed_hooks: _ConfigChangedHooksType = dataclasses.field(default_factory=list)
+ config_changed_hooks: List[Tuple[Optional[str], Callable]] = dataclasses.field(
+ default_factory=list)
@dataclasses.dataclass