Skip to content

Commit 8f720d0

Browse files
committed
bpo-46474: Apply changes from importlib_metadata 4.10.0
1 parent a941e59 commit 8f720d0

File tree

3 files changed

+3
-28
lines changed

3 files changed

+3
-28
lines changed

Lib/importlib/metadata/__init__.py

-12
Original file line numberDiff line numberDiff line change
@@ -571,18 +571,6 @@ def _discover_resolvers():
571571
)
572572
return filter(None, declared)
573573

574-
@classmethod
575-
def _local(cls, root='.'):
576-
from pep517 import build, meta
577-
578-
system = build.compat_system(root)
579-
builder = functools.partial(
580-
meta.build,
581-
source_dir=root,
582-
system=system,
583-
)
584-
return PathDistribution(zipfile.Path(meta.build_as_zip(builder)))
585-
586574
@property
587575
def metadata(self) -> _meta.PackageMetadata:
588576
"""Return the parsed metadata for this Distribution.

Lib/test/test_importlib/fixtures.py

+1-16
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from typing import Dict, Union
1313

1414
try:
15-
from importlib import resources
15+
from importlib import resources # type: ignore
1616

1717
getattr(resources, 'files')
1818
getattr(resources, 'as_file')
@@ -232,21 +232,6 @@ def setUp(self):
232232
build_files(EggInfoFile.files, prefix=self.site_dir)
233233

234234

235-
class LocalPackage:
236-
files: FilesDef = {
237-
"setup.py": """
238-
import setuptools
239-
setuptools.setup(name="local-pkg", version="2.0.1")
240-
""",
241-
}
242-
243-
def setUp(self):
244-
self.fixtures = contextlib.ExitStack()
245-
self.addCleanup(self.fixtures.close)
246-
self.fixtures.enter_context(tempdir_as_cwd())
247-
build_files(self.files)
248-
249-
250235
def build_files(file_defs, prefix=pathlib.Path()):
251236
"""Build a set of files/directories, as described by the
252237
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Removed private method from ``importlib.metadata.Path``. Sync with
2+
importlib_metadata 4.10.0.

0 commit comments

Comments
 (0)