summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2022-01-23 02:39:00 (GMT)
committerGitHub <noreply@github.com>2022-01-23 02:39:00 (GMT)
commit443dec6c9a104386ee90165d32fb28d0c5d29043 (patch)
tree90a2b40bff98acd948610fa7192247ff4d1cbba5
parentd888ff5381594641126065e78dc9210dae4436a4 (diff)
downloadcpython-443dec6c9a104386ee90165d32fb28d0c5d29043.zip
cpython-443dec6c9a104386ee90165d32fb28d0c5d29043.tar.gz
cpython-443dec6c9a104386ee90165d32fb28d0c5d29043.tar.bz2
bpo-46474: Apply changes from importlib_metadata 4.10.0 (GH-30802)
-rw-r--r--Lib/importlib/metadata/__init__.py12
-rw-r--r--Lib/test/test_importlib/fixtures.py17
-rw-r--r--Misc/NEWS.d/next/Library/2022-01-22-14-45-46.bpo-46474.2DUC62.rst2
3 files changed, 3 insertions, 28 deletions
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
index d44541f..5ef6d9d 100644
--- a/Lib/importlib/metadata/__init__.py
+++ b/Lib/importlib/metadata/__init__.py
@@ -571,18 +571,6 @@ class Distribution:
)
return filter(None, declared)
- @classmethod
- def _local(cls, root='.'):
- from pep517 import build, meta
-
- system = build.compat_system(root)
- builder = functools.partial(
- meta.build,
- source_dir=root,
- system=system,
- )
- return PathDistribution(zipfile.Path(meta.build_as_zip(builder)))
-
@property
def metadata(self) -> _meta.PackageMetadata:
"""Return the parsed metadata for this Distribution.
diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index d7ed4e9..803d373 100644
--- a/Lib/test/test_importlib/fixtures.py
+++ b/Lib/test/test_importlib/fixtures.py
@@ -12,7 +12,7 @@ from test.support import requires_zlib
from typing import Dict, Union
try:
- from importlib import resources
+ from importlib import resources # type: ignore
getattr(resources, 'files')
getattr(resources, 'as_file')
@@ -232,21 +232,6 @@ class EggInfoFile(OnSysPath, SiteDir):
build_files(EggInfoFile.files, prefix=self.site_dir)
-class LocalPackage:
- files: FilesDef = {
- "setup.py": """
- import setuptools
- setuptools.setup(name="local-pkg", version="2.0.1")
- """,
- }
-
- def setUp(self):
- self.fixtures = contextlib.ExitStack()
- self.addCleanup(self.fixtures.close)
- self.fixtures.enter_context(tempdir_as_cwd())
- build_files(self.files)
-
-
def build_files(file_defs, prefix=pathlib.Path()):
"""Build a set of files/directories, as described by the
diff --git a/Misc/NEWS.d/next/Library/2022-01-22-14-45-46.bpo-46474.2DUC62.rst b/Misc/NEWS.d/next/Library/2022-01-22-14-45-46.bpo-46474.2DUC62.rst
new file mode 100644
index 0000000..a5eafdf
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-01-22-14-45-46.bpo-46474.2DUC62.rst
@@ -0,0 +1,2 @@
+Removed private method from ``importlib.metadata.Path``. Sync with
+importlib_metadata 4.10.0.