From e6f3474f55b5b43ea86c77eda949f7d4f2fceae2 Mon Sep 17 00:00:00 2001 From: hauntsaninja <> Date: Sat, 30 Apr 2022 23:35:37 -0600 Subject: [PATCH 1/2] Re-export importlib.metadata from _pytest.compat I'm fixing a bug in mypy's --no-implicit-reexport logic in https://github.com/python/mypy/pull/12704 and mypy-primer flagged this --- src/_pytest/compat.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py index e4c2a5fdac1..8b77de28f10 100644 --- a/src/_pytest/compat.py +++ b/src/_pytest/compat.py @@ -50,9 +50,11 @@ class NotSetType(enum.Enum): # fmt: on if sys.version_info >= (3, 8): - from importlib import metadata as importlib_metadata + import importlib.metadata + + importlib_metadata = importlib.metadata else: - import importlib_metadata # noqa: F401 + import importlib_metadata as importlib_metadata # noqa: F401 def _format_args(func: Callable[..., Any]) -> str: From 3fec51e770f18086db348fd9f17b126f89d1f8bf Mon Sep 17 00:00:00 2001 From: hauntsaninja <> Date: Sat, 30 Apr 2022 23:39:07 -0600 Subject: [PATCH 2/2] add changelog --- changelog/9906.trivial.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/9906.trivial.rst diff --git a/changelog/9906.trivial.rst b/changelog/9906.trivial.rst new file mode 100644 index 00000000000..8911b7190f6 --- /dev/null +++ b/changelog/9906.trivial.rst @@ -0,0 +1 @@ +Made ``_pytest.compat`` re-export ``importlib_metadata`` in the eyes of type checkers.