summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2023-06-13 17:04:35 +0200
committerFlorian Bruhin <me@the-compiler.org>2023-06-13 18:53:00 +0200
commit13c412f13e4e9057e4754fdcca5d2969d8364007 (patch)
treecef90b69d355387615744dbbecaf40f3224e7d52
parentd9543de98cc066d7cc5c4f260095510dbcb8eaa4 (diff)
downloadqutebrowser-13c412f13e4e9057e4754fdcca5d2969d8364007.tar.gz
qutebrowser-13c412f13e4e9057e4754fdcca5d2969d8364007.zip
qt: Fix lint
-rw-r--r--qutebrowser/misc/earlyinit.py4
-rw-r--r--qutebrowser/qt/machinery.py2
-rw-r--r--tests/unit/test_qt_machinery.py2
3 files changed, 3 insertions, 5 deletions
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index aa0300721..40f6dbd49 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -155,7 +155,7 @@ def _fatal_qt_error(text: str) -> NoReturn:
sys.exit(1)
-def check_qt_available(info: machinery.SelectionInfo):
+def check_qt_available(info: machinery.SelectionInfo) -> None:
"""Check if Qt core modules (QtCore/QtWidgets) are installed."""
if info.wrapper is None:
_fatal_qt_error(f"No Qt wrapper was importable.\n\n{info}")
@@ -174,7 +174,6 @@ def check_qt_available(info: machinery.SelectionInfo):
_fatal_qt_error(text)
-
def qt_version(qversion=None, qt_version_str=None):
"""Get a Qt version string based on the runtime/compiled versions."""
if qversion is None:
@@ -253,7 +252,6 @@ def _check_modules(modules):
def check_libraries():
"""Check if all needed Python libraries are installed."""
- from qutebrowser.qt import machinery
modules = {
'jinja2': _missing_str("jinja2"),
'yaml': _missing_str("PyYAML"),
diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py
index d4479a247..99b23ec8e 100644
--- a/qutebrowser/qt/machinery.py
+++ b/qutebrowser/qt/machinery.py
@@ -239,7 +239,7 @@ def init_implicit() -> None:
if _initialized:
# Implicit initialization can happen multiple times
# (all subsequent calls are a no-op)
- return None
+ return
info = _select_wrapper(args=None)
if info.wrapper is None:
diff --git a/tests/unit/test_qt_machinery.py b/tests/unit/test_qt_machinery.py
index 4af5a78f3..c0253ce55 100644
--- a/tests/unit/test_qt_machinery.py
+++ b/tests/unit/test_qt_machinery.py
@@ -22,7 +22,7 @@
import sys
import argparse
import typing
-from typing import Any, Optional, Dict, List, Type
+from typing import Any, Optional, Dict, List
import pytest