From b82769710c9fb63193654f3f5b0153c1da51c3cd Mon Sep 17 00:00:00 2001 From: Jimmy 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 | 2 +- tests/conftest.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index 6df3b02a4..b82d74e74 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -122,7 +122,7 @@ class StateConfig(configparser.ConfigParser): """ try: # pylint: disable=unused-import,redefined-outer-name - import qutebrowser.qt + import qutebrowser.qt.webenginewidgets except ImportError: return False return True diff --git a/tests/conftest.py b/tests/conftest.py index 8d11c154a..b69f1de36 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -259,11 +259,10 @@ 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 elif backend == 'webengine': - import qutebrowser.qt + import qutebrowser.qt.webenginewidgets else: raise utils.Unreachable(backend) @@ -277,9 +276,9 @@ def _auto_select_backend(): import qutebrowser.qt return 'webkit' except ImportError: + import qutebrowser.qt.webenginewidgets # Try to use QtWebEngine as a fallback and fail early # if that's also not available - import qutebrowser.qt return 'webengine' -- cgit v1.2.3-54-g00ecf