From 802ef377dbddac79016824a161cba97345895790 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Sat, 16 Apr 2022 16:19:50 +1200
Subject: Restore "unused" imports after pyqt wrapper re-write

Some test imports that didn't have the things there were importing used
got dropped by the rename tool. This restores them.

Found by searching in the diff for eg `import qutebrowser.qt$` and
`import qutebrowser.qt `

Relates to #995
---
 qutebrowser/config/configfiles.py |  6 ++----
 tests/conftest.py                 | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index f86f47b07..0553ef59f 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -39,7 +39,7 @@ from qutebrowser.config import (configexc, config, configdata, configutils,
                                 configtypes)
 from qutebrowser.keyinput import keyutils
 from qutebrowser.utils import standarddir, utils, qtutils, log, urlmatch, version
-from qutebrowser.qt import QtCore
+from qutebrowser.qt import QtWebEngineWidgets, QtCore
 
 if TYPE_CHECKING:
     from qutebrowser.misc import savemanager
@@ -117,9 +117,7 @@ class StateConfig(configparser.ConfigParser):
 
         Note that it's too early to use objects.backend here...
         """
-        try:
-            import qutebrowser.qt  # pylint: disable=unused-import
-        except ImportError:
+        if not QtWebEngineWidgets:
             return 'no'
         return str(version.qtwebengine_versions(avoid_init=True).webengine)
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 0b8a6cd3a..0d3f5b9bb 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -248,11 +248,12 @@ def _select_backend(config):
     backend = backend_arg or backend_env or _auto_select_backend()
 
     # Fail early if selected backend is not available
-    # pylint: disable=unused-import
     if backend == 'webkit':
-        import qutebrowser.qt
+        from qutebrowser.qt import QtWebKitWidgets
+        assert QtWebKitWidgets is not None
     elif backend == 'webengine':
-        import qutebrowser.qt
+        from qutebrowser.qt import QtWebEngineWidgets
+        assert QtWebEngineWidgets is not None
     else:
         raise utils.Unreachable(backend)
 
@@ -260,17 +261,18 @@ 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 QtWebKitWidgets
+    if QtWebKitWidgets:
         return 'webkit'
-    except ImportError:
+    from qutebrowser.qt import QtWebEngineWidgets
+    if QtWebEngineWidgets:
         # Try to use QtWebEngine as a fallback and fail early
         # if that's also not available
-        import qutebrowser.qt
         return 'webengine'
 
+    return None
+
 
 def pytest_report_header(config):
     if config.webengine:
-- 
cgit v1.2.3-54-g00ecf