From 45ea38c26426caa431e6223e80341919e24bf8f1 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 20 Aug 2019 06:55:27 +0200 Subject: [PATCH] test_pluginmanager: use pluggy.manager.metadata This has the version switch in a central place only once. Ref: https://github.com/pytest-dev/pluggy/pull/223/files#r315505111 --- src/pluggy/manager.py | 6 +++--- testing/test_pluginmanager.py | 9 ++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/pluggy/manager.py b/src/pluggy/manager.py index 6aecb2ac..eb5accca 100644 --- a/src/pluggy/manager.py +++ b/src/pluggy/manager.py @@ -5,9 +5,9 @@ import warnings if sys.version_info >= (3, 8): - from importlib import metadata + from importlib import metadata as importlib_metadata else: - import importlib_metadata as metadata + import importlib_metadata def _warn_for_function(warning, function): @@ -283,7 +283,7 @@ def load_setuptools_entrypoints(self, group, name=None): :return: return the number of loaded plugins by this call. """ count = 0 - for dist in metadata.distributions(): + for dist in importlib_metadata.distributions(): for ep in dist.entry_points: if ( ep.group != group diff --git a/testing/test_pluginmanager.py b/testing/test_pluginmanager.py index 693280c8..67261aaa 100644 --- a/testing/test_pluginmanager.py +++ b/testing/test_pluginmanager.py @@ -2,7 +2,6 @@ ``PluginManager`` unit and public API testing. """ import pytest -import sys import types from pluggy import ( @@ -12,11 +11,7 @@ HookimplMarker, HookspecMarker, ) - -if sys.version_info >= (3, 8): - from importlib import metadata -else: - import importlib_metadata as metadata +from pluggy.manager import importlib_metadata hookspec = HookspecMarker("example") @@ -472,7 +467,7 @@ class Distribution(object): def my_distributions(): return (dist,) - monkeypatch.setattr(metadata, "distributions", my_distributions) + monkeypatch.setattr(importlib_metadata, "distributions", my_distributions) num = pm.load_setuptools_entrypoints("hello") assert num == 1 plugin = pm.get_plugin("myname")