summaryrefslogtreecommitdiff
path: root/qutebrowser/qt/machinery.py
diff options
context:
space:
mode:
Diffstat (limited to 'qutebrowser/qt/machinery.py')
-rw-r--r--qutebrowser/qt/machinery.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py
index 4ef9017be..3ed90f27d 100644
--- a/qutebrowser/qt/machinery.py
+++ b/qutebrowser/qt/machinery.py
@@ -124,10 +124,16 @@ def _autoselect_wrapper() -> SelectionInfo:
for wrapper in WRAPPERS:
try:
importlib.import_module(wrapper)
- except ImportError as e:
+ except ModuleNotFoundError as e:
+ # Wrapper not available -> try the next one.
info.set_module(wrapper, f"{type(e).__name__}: {e}")
continue
+ except ImportError as e:
+ # Any other ImportError -> stop to surface the error.
+ info.set_module(wrapper, f"{type(e).__name__}: {e}")
+ break
+ # Wrapper imported successfully -> use it.
info.set_module(wrapper, "success")
info.wrapper = wrapper
return info