From 71e9b9d854f98627dcec378ed2b0b696177d66ba Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 11 Sep 2022 17:17:46 +1200 Subject: fix lint: qt5 vs qt6 confusion --- qutebrowser/browser/webengine/webview.py | 4 +++- qutebrowser/keyinput/keyutils.py | 4 +++- qutebrowser/qt/sip.py | 2 +- qutebrowser/utils/version.py | 1 - 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index bb0e3856a..fdce9f8e9 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -196,7 +196,9 @@ class WebEnginePage(QWebEnginePage): self._set_bg_color() config.instance.changed.connect(self._set_bg_color) if machinery.IS_QT6: - self.certificateError.connect(self._handle_certificate_error) + self.certificateError.connect( # pylint: disable=no-member + self._handle_certificate_error + ) @config.change_filter('colors.webpage.bg') def _set_bg_color(self): diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py index 6016d61f4..7170e77dc 100644 --- a/qutebrowser/keyinput/keyutils.py +++ b/qutebrowser/keyinput/keyutils.py @@ -39,7 +39,9 @@ from qutebrowser.qt import machinery from qutebrowser.qt.core import Qt, QEvent from qutebrowser.qt.gui import QKeySequence, QKeyEvent if machinery.IS_QT6: - from qutebrowser.qt.core import QKeyCombination + # FIXME:qt6 (lint) how come pylint isn't picking this up with both backends + # installed? + from qutebrowser.qt.core import QKeyCombination # pylint: disable=no-name-in-module else: QKeyCombination = None diff --git a/qutebrowser/qt/sip.py b/qutebrowser/qt/sip.py index 6430aa482..1cfaf52aa 100644 --- a/qutebrowser/qt/sip.py +++ b/qutebrowser/qt/sip.py @@ -28,4 +28,4 @@ else: raise machinery.UnknownWrapper() if not VENDORED_SIP: - from sip import * # type: ignore[import] + from sip import * # type: ignore[import] # pylint: disable=import-error diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 7ff13e260..6a318c0ae 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -1029,7 +1029,6 @@ def opengl_info() -> Optional[OpenGLInfo]: # pragma: no cover else: # Qt 6 # FIXME:qt6 (lint) - # pylint: disable-next=no-name-in-module from qutebrowser.qt.opengl import QOpenGLVersionFunctionsFactory vf = QOpenGLVersionFunctionsFactory.get(vp, ctx) except ImportError as e: -- cgit v1.2.3-54-g00ecf