more conditional import changes

2 files changed, 14 insertions, 20 deletions

diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index c29cd970f..d1b2073bf 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -204,19 +204,15 @@ class _BackendProblemChecker:
         """Check whether backends can be imported and return BackendImports."""
         results = _BackendImports()
 
-        try:
-            from qutebrowser.qt import webkit, webkitwidgets
-        except (ImportError, ValueError) as e:
-            results.webkit_error = str(e)
+        from qutebrowser.qt import webkit, webenginecore
+        if not webkit:
+            results.webkit_error = "Unable to find webkit python module"
             assert results.webkit_error
-        else:
-            if not qtutils.is_new_qtwebkit():
-                results.webkit_error = "Unsupported legacy QtWebKit found"
+        elif not qtutils.is_new_qtwebkit():
+            results.webkit_error = "Unsupported legacy QtWebKit found"
 
-        try:
-            from qutebrowser.qt import webenginecore, webenginewidgets
-        except (ImportError, ValueError) as e:
-            results.webengine_error = str(e)
+        if not webenginecore:
+            results.webengine_error = "Unable to find webenginecore python module"
             assert results.webengine_error
 
         return results
diff --git a/tests/conftest.py b/tests/conftest.py
index b59d0ca45..6fe9d8243 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -259,10 +259,11 @@ def _select_backend(config):
     backend = backend_arg or backend_env or _auto_select_backend()
 
     # Fail early if selected backend is not available
+    from qutebrowser.qt import webkit, webenginecore
     if backend == 'webkit':
-        import qutebrowser.qt
+        assert webkit
     elif backend == 'webengine':
-        import qutebrowser.qt.webenginewidgets
+        assert webenginecore
     else:
         raise utils.Unreachable(backend)
 
@@ -271,14 +272,11 @@ def _select_backend(config):
 
 def _auto_select_backend():
     # pylint: disable=unused-import
-    try:
-        # Try to use QtWebKit as the default backend
-        import qutebrowser.qt
+    # Try to use QtWebKit as the default backend
+    from qutebrowser.qt import webkit
+    if webkit:
         return 'webkit'
-    except ImportError:
-        import qutebrowser.qt.webenginewidgets
-        # Try to use QtWebEngine as a fallback and fail early
-        # if that's also not available
+    else:
         return 'webengine'