Refactor imports to ensure DistFacade is only imported when TYPE_CHECKING; update versionadded for list_plugin_distributions() method

Author: RonnyPfannschmidt

src/pluggy/_manager.py

@@ -15,7 +15,6 @@
 
 from . import _tracing
 from ._callers import _multicall
-from ._compat import DistFacade
 from ._hooks import _HookImplFunction
 from ._hooks import _Namespace
 from ._hooks import _Plugin
@@ -32,6 +31,8 @@
 if TYPE_CHECKING:
     import importlib.metadata
 
+    from ._compat import DistFacade
+
 
 _BeforeTrace: TypeAlias = Callable[[str, Sequence[HookImpl], Mapping[str, Any]], None]
 _AfterTrace: TypeAlias = Callable[
@@ -416,6 +417,9 @@ def list_plugin_distinfo(self) -> list[tuple[_Plugin, DistFacade]]:
             Use the modern :meth:`list_plugin_distributions` method to get
             unwrapped :class:`importlib.metadata.Distribution` objects.
         """
+
+        from ._compat import DistFacade
+
         return [(plugin, DistFacade(dist)) for plugin, dist in self._plugin_distinfo]
 
     def list_plugin_distributions(
@@ -424,10 +428,7 @@ def list_plugin_distributions(
         """Return a list of (plugin, distribution) pairs for all plugins
         loaded via entry points.
 
-        Returns modern :class:`importlib.metadata.Distribution` objects without
-        the legacy pkg_resources compatibility layer.
-
-        .. versionadded:: 1.6
+        .. versionadded:: 1.7
         """
         return list(self._plugin_distinfo)
 

testing/test_pluginmanager.py

@@ -12,6 +12,7 @@
 from pluggy import HookspecMarker
 from pluggy import PluginManager
 from pluggy import PluginValidationError
+from pluggy._compat import DistFacade
 
 
 hookspec = HookspecMarker("example")
@@ -583,7 +584,9 @@ class NoHooks:
         pm.add_hookspecs(NoHooks)
 
 
-def test_load_setuptools_instantiation(monkeypatch, pm: PluginManager) -> None:
+def test_load_setuptools_instantiation(
+    monkeypatch: pytest.MonkeyPatch, pm: PluginManager
+) -> None:
     class EntryPoint:
         name = "myname"
         group = "hello"
@@ -626,7 +629,6 @@ def my_distributions():
     assert ret_modern[0][1] == dist  # type: ignore[comparison-overlap]
 
     # Verify the old API wraps with DistFacade while new API doesn't
-    from pluggy._compat import DistFacade
 
     assert isinstance(ret[0][1], DistFacade)
     assert not isinstance(ret_modern[0][1], DistFacade)