diff options
Diffstat (limited to 'qutebrowser/browser')
| -rw-r--r-- | qutebrowser/browser/history.py | 11 | ||||
| -rw-r--r-- | qutebrowser/browser/network/pac.py | 3 | ||||
| -rw-r--r-- | qutebrowser/browser/webengine/interceptor.py | 5 | ||||
| -rw-r--r-- | qutebrowser/browser/webengine/notification.py | 3 | ||||
| -rw-r--r-- | qutebrowser/browser/webengine/webenginequtescheme.py | 3 |
5 files changed, 15 insertions, 10 deletions
diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py index c0b23040c..a83621ae0 100644 --- a/qutebrowser/browser/history.py +++ b/qutebrowser/browser/history.py @@ -23,8 +23,9 @@ import contextlib import pathlib from typing import cast, Mapping, MutableSequence, Optional +from qutebrowser.qt import machinery from qutebrowser.qt.core import pyqtSlot, QUrl, QObject, pyqtSignal -from qutebrowser.qt.widgets import QProgressDialog, QApplication +from qutebrowser.qt.widgets import QProgressDialog, QApplication, QPushButton from qutebrowser.config import config from qutebrowser.api import cmdutils @@ -54,7 +55,13 @@ class HistoryProgress: self._progress.setMaximum(0) # unknown self._progress.setMinimumDuration(0) self._progress.setLabelText(text) - self._progress.setCancelButton(None) + + no_button = None + if machinery.IS_QT6: + # FIXME:mypy PyQt6 stubs issue + no_button = cast(QPushButton, None) + + self._progress.setCancelButton(no_button) self._progress.setAutoClose(False) self._progress.show() QApplication.processEvents() diff --git a/qutebrowser/browser/network/pac.py b/qutebrowser/browser/network/pac.py index c66b6bc03..fcca5d45d 100644 --- a/qutebrowser/browser/network/pac.py +++ b/qutebrowser/browser/network/pac.py @@ -65,7 +65,8 @@ def _js_slot(*args): return self._error_con.callAsConstructor([e]) # pylint: enable=protected-access - deco = pyqtSlot(*args, result=QJSValue) + # FIXME:mypy PyQt6 stubs issue, passing type should work too + deco = pyqtSlot(*args, result="QJSValue") return deco(new_method) return _decorator diff --git a/qutebrowser/browser/webengine/interceptor.py b/qutebrowser/browser/webengine/interceptor.py index 75acb3252..f56db3a65 100644 --- a/qutebrowser/browser/webengine/interceptor.py +++ b/qutebrowser/browser/webengine/interceptor.py @@ -33,9 +33,8 @@ class WebEngineRequest(interceptors.Request): """QtWebEngine-specific request interceptor functionality.""" _WHITELISTED_REQUEST_METHODS = { - # FIXME:mypy PyQt6-stubs issue? - QByteArray(b'GET'), # type: ignore[call-overload,unused-ignore] - QByteArray(b'HEAD'), # type: ignore[call-overload,unused-ignore] + QByteArray(b'GET'), + QByteArray(b'HEAD'), } def __init__(self, *args, webengine_info, **kwargs): diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py index d140a8c61..4d08e914e 100644 --- a/qutebrowser/browser/webengine/notification.py +++ b/qutebrowser/browser/webengine/notification.py @@ -1109,8 +1109,7 @@ class DBusNotificationAdapter(AbstractNotificationAdapter): return None bits = qimage.constBits().asstring(size) - # FIXME:mypy PyQt6-stubs issue - image_data.add(QByteArray(bits)) # type: ignore[call-overload,unused-ignore] + image_data.add(QByteArray(bits)) image_data.endStructure() return image_data diff --git a/qutebrowser/browser/webengine/webenginequtescheme.py b/qutebrowser/browser/webengine/webenginequtescheme.py index 4a09c81fb..010b00975 100644 --- a/qutebrowser/browser/webengine/webenginequtescheme.py +++ b/qutebrowser/browser/webengine/webenginequtescheme.py @@ -25,8 +25,7 @@ from qutebrowser.qt.webenginecore import (QWebEngineUrlSchemeHandler, from qutebrowser.browser import qutescheme from qutebrowser.utils import log, qtutils -# FIXME:mypy PyQt6-stubs issue? -_QUTE = QByteArray(b'qute') # type: ignore[call-overload,unused-ignore] +_QUTE = QByteArray(b'qute') class QuteSchemeHandler(QWebEngineUrlSchemeHandler): |