From 180da6eb6229cce75876b9f5116f3471561a8467 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sat, 30 Apr 2022 17:45:48 +1200 Subject: fix mypy comments after black and isort these will probably conflict with the recent PyQt stubs changes --- qutebrowser/browser/browsertab.py | 4 ++-- qutebrowser/browser/hints.py | 5 +++-- qutebrowser/browser/pdfjs.py | 4 ++-- qutebrowser/browser/shared.py | 9 +++++---- qutebrowser/browser/webengine/webengineinspector.py | 4 ++-- qutebrowser/browser/webengine/webenginetab.py | 4 ++-- qutebrowser/browser/webkit/network/networkreply.py | 12 ++++++------ qutebrowser/components/misccommands.py | 4 ++-- qutebrowser/mainwindow/mainwindow.py | 4 ++-- qutebrowser/mainwindow/prompt.py | 5 +++-- qutebrowser/utils/utils.py | 2 +- 11 files changed, 30 insertions(+), 27 deletions(-) diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index 32a0521f8..a959577a7 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -1270,8 +1270,8 @@ class AbstractTab(QtWidgets.QWidget): try: qurl = self.url() url = qurl.toDisplayString( - QtCore.QUrl.EncodeUnicode - ) # type: ignore[arg-type] + QtCore.QUrl.EncodeUnicode # type: ignore[arg-type] + ) except (AttributeError, RuntimeError) as exc: url = '<{}>'.format(exc.__class__.__name__) else: diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index 94f2efc44..c5c41b78d 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -366,9 +366,10 @@ class HintActions: url: The URL to open as a QUrl. context: The HintContext to use. """ + qurl = QtCore.QUrl urlstr = url.toString( - QtCore.QUrl.FullyEncoded | QtCore.QUrl.RemovePassword - ) # type: ignore[arg-type] + qurl.FullyEncoded | qurl.RemovePassword # type: ignore[arg-type] + ) args = context.get_args(urlstr) commandrunner = runners.CommandRunner(self._win_id) commandrunner.run_safely('spawn ' + ' '.join(args)) diff --git a/qutebrowser/browser/pdfjs.py b/qutebrowser/browser/pdfjs.py index 9e3d6d6dd..aae04eb74 100644 --- a/qutebrowser/browser/pdfjs.py +++ b/qutebrowser/browser/pdfjs.py @@ -94,8 +94,8 @@ def _generate_pdfjs_script(filename): url.setQuery(url_query) js_url = javascript.to_js( - url.toString(QtCore.QUrl.FullyEncoded) - ) # type: ignore[arg-type] + url.toString(QtCore.QUrl.FullyEncoded) # type: ignore[arg-type] + ) return jinja.js_environment.from_string(""" document.addEventListener("DOMContentLoaded", function() { diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py index 0c49f373b..26ea02a13 100644 --- a/qutebrowser/browser/shared.py +++ b/qutebrowser/browser/shared.py @@ -191,8 +191,8 @@ def ignore_certificate_error( # We get the first party URL with a heuristic - with HTTP -> HTTPS redirects, the # scheme might not match. is_resource = first_party_url.isValid() and not request_url.matches( - first_party_url, QtCore.QUrl.RemoveScheme - ) # type: ignore[arg-type] + first_party_url, QtCore.QUrl.RemoveScheme # type: ignore[arg-type] + ) if conf == 'ask' or conf == 'ask-block-thirdparty' and not is_resource: err_template = jinja.environment.from_string(""" @@ -222,9 +222,10 @@ def ignore_certificate_error( error=error, ) + qurl = QtCore.QUrl urlstr = request_url.toString( - QtCore.QUrl.RemovePassword | QtCore.QUrl.FullyEncoded - ) # type: ignore[arg-type] + qurl.RemovePassword | qurl.FullyEncoded # type: ignore[arg-type] + ) ignore = message.ask( title="Certificate error", text=msg, diff --git a/qutebrowser/browser/webengine/webengineinspector.py b/qutebrowser/browser/webengine/webengineinspector.py index 057ddb568..019abc5a7 100644 --- a/qutebrowser/browser/webengine/webengineinspector.py +++ b/qutebrowser/browser/webengine/webengineinspector.py @@ -99,10 +99,10 @@ class WebEngineInspector(inspector.AbstractWebInspector): "please install the qt5-qtwebengine-devtools " "Fedora package.") - def inspect( + def inspect( # type: ignore[override] self, page: QtWebEngineWidgets.QWebEnginePage, - ) -> None: # type: ignore[override] + ) -> None: inspector_page = self._widget.page() inspector_page.setInspectedPage(page) self._settings.update_for_url(inspector_page.requestedUrl()) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index fad6e15fb..a2a2c1069 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -1484,8 +1484,8 @@ class WebEngineTab(browsertab.AbstractTab): title_url = QtCore.QUrl(url) title_url.setScheme('') title_url_str = title_url.toDisplayString( - QtCore.QUrl.RemoveScheme - ) # type: ignore[arg-type] + QtCore.QUrl.RemoveScheme # type: ignore[arg-type] + ) if title == title_url_str.strip('/'): title = "" diff --git a/qutebrowser/browser/webkit/network/networkreply.py b/qutebrowser/browser/webkit/network/networkreply.py index 1813a0c35..c74331c2e 100644 --- a/qutebrowser/browser/webkit/network/networkreply.py +++ b/qutebrowser/browser/webkit/network/networkreply.py @@ -123,11 +123,11 @@ class ErrorNetworkReply(QtNetwork.QNetworkReply): self.setOpenMode(QtCore.QIODevice.ReadOnly) self.setError(error, errorstring) QtCore.QTimer.singleShot( - 0, lambda: self.error.emit(error) - ) # type: ignore[attr-defined] + 0, lambda: self.error.emit(error) # type: ignore[attr-defined] + ) QtCore.QTimer.singleShot( - 0, lambda: self.finished.emit() - ) # type: ignore[attr-defined] + 0, lambda: self.finished.emit() # type: ignore[attr-defined] + ) def abort(self): """Do nothing since it's a fake reply.""" @@ -155,8 +155,8 @@ class RedirectNetworkReply(QtNetwork.QNetworkReply): super().__init__(parent) self.setAttribute(QtNetwork.QNetworkRequest.RedirectionTargetAttribute, new_url) QtCore.QTimer.singleShot( - 0, lambda: self.finished.emit() - ) # type: ignore[attr-defined] + 0, lambda: self.finished.emit() # type: ignore[attr-defined] + ) def abort(self): """Called when there's e.g. a redirection limit.""" diff --git a/qutebrowser/components/misccommands.py b/qutebrowser/components/misccommands.py index da6d0bb41..c894ceb03 100644 --- a/qutebrowser/components/misccommands.py +++ b/qutebrowser/components/misccommands.py @@ -80,8 +80,8 @@ def _print_preview(tab: apitypes.Tab) -> None: diag = QtPrintSupport.QPrintPreviewDialog(tab) diag.setAttribute(QtCore.Qt.WA_DeleteOnClose) diag.setWindowFlags( - diag.windowFlags() - | QtCore.Qt.WindowMaximizeButtonHint # type: ignore[operator, arg-type] + diag.windowFlags() # type: ignore[operator, arg-type] + | QtCore.Qt.WindowMaximizeButtonHint | QtCore.Qt.WindowMinimizeButtonHint ) diag.paintRequested.connect( diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py index 2f89341c2..7927b6d4e 100644 --- a/qutebrowser/mainwindow/mainwindow.py +++ b/qutebrowser/mainwindow/mainwindow.py @@ -586,8 +586,8 @@ class MainWindow(QtWidgets.QWidget): self.state_before_fullscreen = self.windowState() self.setWindowState( QtCore.Qt.WindowFullScreen - | self.state_before_fullscreen # type: ignore[arg-type] - ) # type: ignore[operator] + | self.state_before_fullscreen # type: ignore[arg-type,operator] + ) elif self.isFullScreen(): self.setWindowState(self.state_before_fullscreen) log.misc.debug( diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py index bc62cbeaa..91b297467 100644 --- a/qutebrowser/mainwindow/prompt.py +++ b/qutebrowser/mainwindow/prompt.py @@ -807,9 +807,10 @@ class DownloadFilenamePrompt(FilenamePrompt): def __init__(self, question, parent=None): super().__init__(question, parent) + qdir = QtCore.QDir self._file_model.setFilter( - QtCore.QDir.AllDirs | QtCore.QDir.Drives | QtCore.QDir.NoDotAndDotDot - ) # type: ignore[arg-type] + qdir.AllDirs | qdir.Drives | qdir.NoDotAndDotDot # type: ignore[arg-type] + ) def accept(self, value=None, save=False): done = super().accept(value, save) diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index d572f87dc..b84201609 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -63,7 +63,7 @@ try: from yaml import CSafeLoader as YamlLoader YAML_C_EXT = True except ImportError: # pragma: no cover - from yaml import SafeDumper as YamlDumper + from yaml import SafeDumper as YamlDumper # type: ignore[misc] from yaml import SafeLoader as YamlLoader # type: ignore[misc] YAML_C_EXT = False -- cgit v1.2.3-54-g00ecf