diff options
Diffstat (limited to 'qutebrowser/browser/greasemonkey.py')
| -rw-r--r-- | qutebrowser/browser/greasemonkey.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py index 5abb9a137..61594b329 100644 --- a/qutebrowser/browser/greasemonkey.py +++ b/qutebrowser/browser/greasemonkey.py @@ -29,13 +29,12 @@ import textwrap import dataclasses from typing import cast, List, Sequence -from PyQt5.QtCore import pyqtSignal, QObject, QUrl - from qutebrowser.utils import (log, standarddir, jinja, objreg, utils, javascript, urlmatch, version, usertypes, message) from qutebrowser.api import cmdutils from qutebrowser.browser import downloads from qutebrowser.misc import objects +from qutebrowser.qt import QtCore gm_manager = cast('GreasemonkeyManager', None) @@ -221,7 +220,7 @@ class MatchingScripts: """All userscripts registered to run on a particular url.""" - url: QUrl + url: QtCore.QUrl start: List[GreasemonkeyScript] = dataclasses.field(default_factory=list) end: List[GreasemonkeyScript] = dataclasses.field(default_factory=list) idle: List[GreasemonkeyScript] = dataclasses.field(default_factory=list) @@ -238,7 +237,7 @@ class GreasemonkeyMatcher: def __init__(self, url): self._url = url - self._url_string = url.toString(QUrl.FullyEncoded) + self._url_string = url.toString(QtCore.QUrl.FullyEncoded) self.is_greaseable = url.scheme() in self.GREASEABLE_SCHEMES def _match_pattern(self, pattern): @@ -263,7 +262,7 @@ class GreasemonkeyMatcher: return (matching_includes or matching_match) and not matching_excludes -class GreasemonkeyManager(QObject): +class GreasemonkeyManager(QtCore.QObject): """Manager of userscripts and a Greasemonkey compatible environment. @@ -273,7 +272,7 @@ class GreasemonkeyManager(QObject): considered obsolete. """ - scripts_reloaded = pyqtSignal() + scripts_reloaded = QtCore.pyqtSignal() def __init__(self, parent=None): super().__init__(parent) @@ -412,7 +411,7 @@ class GreasemonkeyManager(QObject): for url, target_path in required_dls: target = downloads.FileDownloadTarget(target_path, force_overwrite=True) - download = download_manager.get(QUrl(url), target=target, + download = download_manager.get(QtCore.QUrl(url), target=target, auto_remove=True) download.requested_url = url self._in_progress_dls.append(download) |