[3.13] gh-118803: Fixup a few references in the 3.13 branch to the intended removal date for ByteString (#139171)

This commit is contained in:
Alex Waygood 2025-09-19 18:51:39 +01:00 committed by GitHub
parent 63dd27da3b
commit 8aa856170d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 13 deletions

View file

@ -38,12 +38,6 @@ Pending Removal in Python 3.14
is no current event loop set and it decides to create one. is no current event loop set and it decides to create one.
(Contributed by Serhiy Storchaka and Guido van Rossum in :gh:`100160`.) (Contributed by Serhiy Storchaka and Guido van Rossum in :gh:`100160`.)
* :mod:`collections.abc`: Deprecated :class:`~collections.abc.ByteString`.
Prefer :class:`!Sequence` or :class:`~collections.abc.Buffer`.
For use in typing, prefer a union, like ``bytes | bytearray``,
or :class:`collections.abc.Buffer`.
(Contributed by Shantanu Jain in :gh:`91896`.)
* :mod:`email`: Deprecated the *isdst* parameter in :func:`email.utils.localtime`. * :mod:`email`: Deprecated the *isdst* parameter in :func:`email.utils.localtime`.
(Contributed by Alan Williams in :gh:`72346`.) (Contributed by Alan Williams in :gh:`72346`.)
@ -96,9 +90,6 @@ Pending Removal in Python 3.14
if :ref:`named placeholders <sqlite3-placeholders>` are used and if :ref:`named placeholders <sqlite3-placeholders>` are used and
*parameters* is a sequence instead of a :class:`dict`. *parameters* is a sequence instead of a :class:`dict`.
* :mod:`typing`: :class:`~typing.ByteString`, deprecated since Python 3.9,
now causes a :exc:`DeprecationWarning` to be emitted when it is used.
* :mod:`urllib`: * :mod:`urllib`:
:class:`!urllib.parse.Quoter` is deprecated: it was not intended to be a :class:`!urllib.parse.Quoter` is deprecated: it was not intended to be a
public API. public API.

View file

@ -3953,7 +3953,7 @@ convenience. This is subject to change, and not all deprecations are listed.
- :pep:`585` - :pep:`585`
* - :class:`typing.ByteString` * - :class:`typing.ByteString`
- 3.9 - 3.9
- 3.14 - 3.17
- :gh:`91896` - :gh:`91896`
* - :data:`typing.Text` * - :data:`typing.Text`
- 3.11 - 3.11

View file

@ -1083,7 +1083,7 @@ def __new__(cls, name, bases, namespace, **kwargs):
warnings._deprecated( warnings._deprecated(
"collections.abc.ByteString", "collections.abc.ByteString",
remove=(3, 14), remove=(3, 17),
) )
return super().__new__(cls, name, bases, namespace, **kwargs) return super().__new__(cls, name, bases, namespace, **kwargs)
@ -1092,7 +1092,7 @@ def __instancecheck__(cls, instance):
warnings._deprecated( warnings._deprecated(
"collections.abc.ByteString", "collections.abc.ByteString",
remove=(3, 14), remove=(3, 17),
) )
return super().__instancecheck__(instance) return super().__instancecheck__(instance)

View file

@ -2843,7 +2843,7 @@ class Other(Leaf): # Error reported by type checker
Sequence = _alias(collections.abc.Sequence, 1) Sequence = _alias(collections.abc.Sequence, 1)
MutableSequence = _alias(collections.abc.MutableSequence, 1) MutableSequence = _alias(collections.abc.MutableSequence, 1)
ByteString = _DeprecatedGenericAlias( ByteString = _DeprecatedGenericAlias(
collections.abc.ByteString, 0, removal_version=(3, 14) # Not generic. collections.abc.ByteString, 0, removal_version=(3, 17) # Not generic.
) )
# Tuple accepts variable number of parameters. # Tuple accepts variable number of parameters.
Tuple = _TupleType(tuple, -1, inst=False, name='Tuple') Tuple = _TupleType(tuple, -1, inst=False, name='Tuple')