From 2e6146ce296c3fe2410c79855b6856bc0c748334 Mon Sep 17 00:00:00 2001 From: Maxwell Muoto <41130755+max-muoto@users.noreply.github.com> Date: Tue, 6 Aug 2024 00:51:51 -0500 Subject: [PATCH 1/3] Byestring removal 3.14 --- stdlib/_collections_abc.pyi | 7 +++++-- stdlib/typing.pyi | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stdlib/_collections_abc.pyi b/stdlib/_collections_abc.pyi index 127488ee382c..b43042ae4326 100644 --- a/stdlib/_collections_abc.pyi +++ b/stdlib/_collections_abc.pyi @@ -7,7 +7,6 @@ from typing import ( # noqa: Y022,Y038,Y057 AsyncIterable as AsyncIterable, AsyncIterator as AsyncIterator, Awaitable as Awaitable, - ByteString as ByteString, Callable as Callable, Collection as Collection, Container as Container, @@ -59,8 +58,12 @@ __all__ = [ "ValuesView", "Sequence", "MutableSequence", - "ByteString", ] +if sys.version_info < (3, 14): + from typing import ByteString as ByteString + + __all__ += ["ByteString"] + if sys.version_info >= (3, 12): __all__ += ["Buffer"] diff --git a/stdlib/typing.pyi b/stdlib/typing.pyi index f4de1fa86de5..1757e4a0c6ba 100644 --- a/stdlib/typing.pyi +++ b/stdlib/typing.pyi @@ -4,6 +4,7 @@ # https://github.com/python/mypy/issues/16744 import collections # noqa: F401 # pyright: ignore import sys +from wsgiref.simple_server import sys_version import typing_extensions from _collections_abc import dict_items, dict_keys, dict_values from _typeshed import IdentityFunction, ReadableBuffer, SupportsKeysAndGetItem @@ -846,7 +847,8 @@ class TextIO(IO[str]): @abstractmethod def __enter__(self) -> TextIO: ... -ByteString: typing_extensions.TypeAlias = bytes | bytearray | memoryview +if sys.version_info < (3, 14): + ByteString: typing_extensions.TypeAlias = bytes | bytearray | memoryview # Functions From 7fe412f41f97ed17bf837dc0275ccb2ffb06eb47 Mon Sep 17 00:00:00 2001 From: Maxwell Muoto <41130755+max-muoto@users.noreply.github.com> Date: Tue, 6 Aug 2024 00:52:26 -0500 Subject: [PATCH 2/3] Fix --- stdlib/typing.pyi | 1 - 1 file changed, 1 deletion(-) diff --git a/stdlib/typing.pyi b/stdlib/typing.pyi index 1757e4a0c6ba..f6fb00e4b280 100644 --- a/stdlib/typing.pyi +++ b/stdlib/typing.pyi @@ -4,7 +4,6 @@ # https://github.com/python/mypy/issues/16744 import collections # noqa: F401 # pyright: ignore import sys -from wsgiref.simple_server import sys_version import typing_extensions from _collections_abc import dict_items, dict_keys, dict_values from _typeshed import IdentityFunction, ReadableBuffer, SupportsKeysAndGetItem From 7c3f6ca5dfcb2680a06763c9cfe15c5dc52c140d Mon Sep 17 00:00:00 2001 From: Maxwell Muoto <41130755+max-muoto@users.noreply.github.com> Date: Tue, 6 Aug 2024 00:57:24 -0500 Subject: [PATCH 3/3] Fix --- stdlib/_collections_abc.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/_collections_abc.pyi b/stdlib/_collections_abc.pyi index b43042ae4326..8b1ac9c7eb8b 100644 --- a/stdlib/_collections_abc.pyi +++ b/stdlib/_collections_abc.pyi @@ -1,7 +1,7 @@ import sys from abc import abstractmethod from types import MappingProxyType -from typing import ( # noqa: Y022,Y038,Y057 +from typing import ( # noqa: Y022,Y038 AbstractSet as Set, AsyncGenerator as AsyncGenerator, AsyncIterable as AsyncIterable, @@ -60,7 +60,7 @@ __all__ = [ "MutableSequence", ] if sys.version_info < (3, 14): - from typing import ByteString as ByteString + from typing import ByteString as ByteString # noqa: Y057 __all__ += ["ByteString"]