From 4094e15bcbe71311685cb8c57abb6bfb4deadbdc Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 30 Mar 2022 13:39:48 +0200 Subject: version: Always prefer builtin importlib.metadata If we have a builtin importlib.metadata (Python 3.8+) and the importlib_metadata backport installed, we preferred the backport. However, the version.py tests do the opposite: They only mock the builtin if it is available. This did lead to failing tests if the backport was installed in an environment where the builtin was available too. Since we don't need any specialized functionality (only reading the version), we can prefer the builtin no matter whether a backport is available or not. --- qutebrowser/utils/version.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 33acdce57..bf6b49fa6 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -511,11 +511,10 @@ def _get_pyqt_webengine_qt_version() -> Optional[str]: give us an accurate answer. """ try: - import importlib_metadata + import importlib.metadata as importlib_metadata # type: ignore[import] except ImportError: try: - # pylint: disable=line-too-long - import importlib.metadata as importlib_metadata # type: ignore[import, no-redef] + import importlib_metadata # type: ignore[no-redef] except ImportError: log.misc.debug("Neither importlib.metadata nor backport available") return None -- cgit v1.2.3-54-g00ecf