From 9620856e3647d61b30523f6522c42566b55c40d3 Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 26 Jun 2022 15:53:41 +1200 Subject: fix lint: make flake8 happy --- .flake8 | 1 + qutebrowser/qt.py | 4 +++- qutebrowser/utils/qtutils.py | 6 ++---- qutebrowser/utils/version.py | 6 ++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.flake8 b/.flake8 index 34a829a4b..2a7a98275 100644 --- a/.flake8 +++ b/.flake8 @@ -65,6 +65,7 @@ per-file-ignores = tests/unit/browser/test_history.py : D100,D101,N806 tests/helpers/fixtures.py : D100,D101,N806 tests/unit/browser/webkit/http/test_content_disposition.py : D100,D101,D400 + qutebrowser/qt.py : N813 copyright-check = True copyright-regexp = # Copyright [\d-]+ .* copyright-min-file-size = 110 diff --git a/qutebrowser/qt.py b/qutebrowser/qt.py index 6a8d97e3b..cadddd47e 100644 --- a/qutebrowser/qt.py +++ b/qutebrowser/qt.py @@ -23,12 +23,14 @@ import importlib from dataclasses import dataclass + @dataclass class _Machinery: IS_QT6: bool IS_QT5: bool PACKAGE: str + PyQt5 = PyQt6 = False try: import PyQt5 as pyqt # noqa: N813 @@ -106,7 +108,7 @@ try: ]: setattr(webenginecore, attr, getattr(webenginewidgets, attr)) delattr(webenginewidgets, attr) - webenginecore.QWebEngineDownloadRequest = getattr( + webenginecore.QWebEngineDownloadRequest = getattr( # noqa: B009 webenginecore, "QWebEngineDownloadItem", ) diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py index cb5d3c93a..4ce67337f 100644 --- a/qutebrowser/utils/qtutils.py +++ b/qutebrowser/utils/qtutils.py @@ -44,11 +44,9 @@ from qutebrowser.qt import core, gui, webkit if webkit: - qWebKitVersion = webkit.qWebKitVersion + qWebKitVersion = webkit.qWebKitVersion # noqa: N816 else: - # pylint: disable=unnecessary-lambda-assignment - qWebKitVersion = lambda: None # type: ignore[assignment] # noqa: N816 - # pylint: enable=unnecessary-lambda-assignment + qWebKitVersion = lambda: None # pylint: disable=unnecessary-lambda-assignment # type: ignore[assignment] # noqa: N816 MAXVALS = { diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index ed426a9a2..695f67271 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -52,11 +52,9 @@ if TYPE_CHECKING: if webkit: - qWebKitVersion = webkit.qWebKitVersion + qWebKitVersion = webkit.qWebKitVersion # noqa: N816 else: - # pylint: disable=unnecessary-lambda-assignment - qWebKitVersion = lambda: None # type: ignore[assignment] # noqa: N816 - # pylint: enable=unnecessary-lambda-assignment + qWebKitVersion = lambda: None # pylint: disable=unnecessary-lambda-assignment # type: ignore[assignment] # noqa: N816 if webenginecore: -- cgit v1.2.3-54-g00ecf