Refresh from importlib_metadata@cpython

diff --git a/Lib/importlib/metadata/_hooks.py b/Lib/importlib/metadata/_hooks.py
index 11b94772a5352bc7939ff913d8e052ef92921e14..4c57f4d48ee223d57785c07b680adfd6c1ee01e3 100644 (file)
--- a/Lib/importlib/metadata/_hooks.py
+++ b/Lib/importlib/metadata/_hooks.py
@@ -1,26 +1,7 @@
-import sys
-
 from .api import Distribution
-from .abc import DistributionFinder
 from contextlib import suppress
 
 
-def install(cls):
-    """Class decorator for installation on sys.meta_path."""
-    sys.meta_path.append(cls())
-    return cls
-
-
-class NullFinder(DistributionFinder):
-    """
-    A "Finder" (aka "MetaClassFinder") that never finds any modules,
-    but may find distributions.
-    """
-    @staticmethod
-    def find_spec(*args, **kwargs):
-        return None
-
-
 class PathDistribution(Distribution):
     def __init__(self, path):
         """Construct a distribution from a path to the metadata directory."""

diff --git a/Lib/test/test_importlib/test_zip.py b/Lib/test/test_importlib/test_zip.py
index 9b6bce0d4c2faa674746bce77b044f005a27d65d..e92028cf599a224abb28e0e4ac145d691d7a4daf 100644 (file)
--- a/Lib/test/test_importlib/test_zip.py
+++ b/Lib/test/test_importlib/test_zip.py
@@ -45,7 +45,7 @@ class TestEgg(TestZip):
         self.resources = ExitStack()
         self.addCleanup(self.resources.close)
         egg = self.resources.enter_context(
-            path('importlib_metadata.tests.data',
+            path('test.test_importlib.data',
                  'example-21.12-py3.6.egg'))
         sys.path.insert(0, str(egg))
         self.resources.callback(sys.path.pop, 0)