diff options
| author | Florian Bruhin <me@the-compiler.org> | 2023-06-13 12:18:44 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2023-06-13 12:18:44 +0200 |
| commit | 9588e0aec0f3f758d00a4738409abb4b9df28242 (patch) | |
| tree | 1966aad560911ff5c0fe4386704b91466f0cd15f | |
| parent | a25e8a09873838ca9efefd36ea8a45170bbeb95c (diff) | |
| download | qutebrowser-9588e0aec0f3f758d00a4738409abb4b9df28242.tar.gz qutebrowser-9588e0aec0f3f758d00a4738409abb4b9df28242.zip | |
qt: Treat empty QUTE_QT_WRAPPER as unset
| -rw-r--r-- | qutebrowser/qt/machinery.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_qt_machinery.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py index 9f16312bf..6e7085040 100644 --- a/qutebrowser/qt/machinery.py +++ b/qutebrowser/qt/machinery.py @@ -131,7 +131,7 @@ def _select_wrapper(args: Optional[argparse.Namespace]) -> SelectionInfo: env_var = "QUTE_QT_WRAPPER" env_wrapper = os.environ.get(env_var) - if env_wrapper is not None: + if env_wrapper: if env_wrapper not in WRAPPERS: raise Error(f"Unknown wrapper {env_wrapper} set via {env_var}, " f"allowed: {', '.join(WRAPPERS)}") diff --git a/tests/unit/test_qt_machinery.py b/tests/unit/test_qt_machinery.py index b0b7e08a2..4184a4388 100644 --- a/tests/unit/test_qt_machinery.py +++ b/tests/unit/test_qt_machinery.py @@ -79,9 +79,11 @@ def test_autoselect( # Defaults with no overrides (None, None, "PyQt5"), (argparse.Namespace(qt_wrapper=None), None, "PyQt5"), + (argparse.Namespace(qt_wrapper=None), "", "PyQt5"), # Only argument given (argparse.Namespace(qt_wrapper="PyQt6"), None, "PyQt6"), (argparse.Namespace(qt_wrapper="PyQt5"), None, "PyQt5"), + (argparse.Namespace(qt_wrapper="PyQt5"), "", "PyQt5"), # Only environment variable given (None, "PyQt6", "PyQt6"), (None, "PyQt5", "PyQt5"), |