From 8a7f09e3511f3a1d04281c60167b8dcc3b78938b Mon Sep 17 00:00:00 2001 From: Max Muoto Date: Tue, 6 Aug 2024 09:16:49 -0500 Subject: [PATCH] Byestring removal for 3.14 (#12490) --- stdlib/_collections_abc.pyi | 9 ++++++--- stdlib/typing.pyi | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stdlib/_collections_abc.pyi b/stdlib/_collections_abc.pyi index 127488ee3..8b1ac9c7e 100644 --- a/stdlib/_collections_abc.pyi +++ b/stdlib/_collections_abc.pyi @@ -1,13 +1,12 @@ 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, 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 # noqa: Y057 + + __all__ += ["ByteString"] + if sys.version_info >= (3, 12): __all__ += ["Buffer"] diff --git a/stdlib/typing.pyi b/stdlib/typing.pyi index f4de1fa86..f6fb00e4b 100644 --- a/stdlib/typing.pyi +++ b/stdlib/typing.pyi @@ -846,7 +846,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