From 454438e4db1e259900f3f1aa602a39ef3ac23af2 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 2 Sep 2023 10:03:08 +0300 Subject: [PATCH] Update `importlib.resources` to 3.12 (#10649) --- stdlib/importlib/resources/__init__.pyi | 11 +++++++++-- tests/stubtest_allowlists/py312.txt | 1 - 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stdlib/importlib/resources/__init__.pyi b/stdlib/importlib/resources/__init__.pyi index ba3d9b087..8d6565637 100644 --- a/stdlib/importlib/resources/__init__.pyi +++ b/stdlib/importlib/resources/__init__.pyi @@ -7,6 +7,9 @@ from types import ModuleType from typing import Any, BinaryIO, TextIO from typing_extensions import TypeAlias +if sys.version_info >= (3, 9): + from importlib.abc import Traversable + __all__ = ["Package", "Resource", "contents", "is_resource", "open_binary", "open_text", "path", "read_binary", "read_text"] if sys.version_info >= (3, 9): @@ -31,9 +34,13 @@ def is_resource(package: Package, name: str) -> bool: ... def contents(package: Package) -> Iterator[str]: ... if sys.version_info >= (3, 9): - from importlib.abc import Traversable - def files(package: Package) -> Traversable: ... def as_file(path: Traversable) -> AbstractContextManager[Path]: ... +if sys.version_info >= (3, 12): + def files(anchor: Package | None = ...) -> Traversable: ... + +elif sys.version_info >= (3, 9): + def files(package: Package) -> Traversable: ... + if sys.version_info >= (3, 10): from importlib.abc import ResourceReader as ResourceReader diff --git a/tests/stubtest_allowlists/py312.txt b/tests/stubtest_allowlists/py312.txt index 00c3483b3..eacc5514f 100644 --- a/tests/stubtest_allowlists/py312.txt +++ b/tests/stubtest_allowlists/py312.txt @@ -16,7 +16,6 @@ importlib.metadata.SelectableGroups importlib.metadata._meta.PackageMetadata.get importlib.metadata._meta.SimplePath.__truediv__ importlib.metadata._meta.SimplePath.parent -importlib.resources.files poplib.POP3_SSL.__init__ smtplib.SMTP.starttls smtplib.SMTP_SSL.__init__