Skip to content

Commit 8aa8561

Browse files
authored
[3.13] gh-118803: Fixup a few references in the 3.13 branch to the intended removal date for ByteString (#139171)
1 parent 63dd27d commit 8aa8561

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

Doc/deprecations/pending-removal-in-3.14.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ Pending Removal in Python 3.14
3838
is no current event loop set and it decides to create one.
3939
(Contributed by Serhiy Storchaka and Guido van Rossum in :gh:`100160`.)
4040

41-
* :mod:`collections.abc`: Deprecated :class:`~collections.abc.ByteString`.
42-
Prefer :class:`!Sequence` or :class:`~collections.abc.Buffer`.
43-
For use in typing, prefer a union, like ``bytes | bytearray``,
44-
or :class:`collections.abc.Buffer`.
45-
(Contributed by Shantanu Jain in :gh:`91896`.)
46-
4741
* :mod:`email`: Deprecated the *isdst* parameter in :func:`email.utils.localtime`.
4842
(Contributed by Alan Williams in :gh:`72346`.)
4943

@@ -96,9 +90,6 @@ Pending Removal in Python 3.14
9690
if :ref:`named placeholders <sqlite3-placeholders>` are used and
9791
*parameters* is a sequence instead of a :class:`dict`.
9892

99-
* :mod:`typing`: :class:`~typing.ByteString`, deprecated since Python 3.9,
100-
now causes a :exc:`DeprecationWarning` to be emitted when it is used.
101-
10293
* :mod:`urllib`:
10394
:class:`!urllib.parse.Quoter` is deprecated: it was not intended to be a
10495
public API.

Doc/library/typing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3953,7 +3953,7 @@ convenience. This is subject to change, and not all deprecations are listed.
39533953
- :pep:`585`
39543954
* - :class:`typing.ByteString`
39553955
- 3.9
3956-
- 3.14
3956+
- 3.17
39573957
- :gh:`91896`
39583958
* - :data:`typing.Text`
39593959
- 3.11

Lib/_collections_abc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ def __new__(cls, name, bases, namespace, **kwargs):
10831083

10841084
warnings._deprecated(
10851085
"collections.abc.ByteString",
1086-
remove=(3, 14),
1086+
remove=(3, 17),
10871087
)
10881088
return super().__new__(cls, name, bases, namespace, **kwargs)
10891089

@@ -1092,7 +1092,7 @@ def __instancecheck__(cls, instance):
10921092

10931093
warnings._deprecated(
10941094
"collections.abc.ByteString",
1095-
remove=(3, 14),
1095+
remove=(3, 17),
10961096
)
10971097
return super().__instancecheck__(instance)
10981098

Lib/typing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2843,7 +2843,7 @@ class Other(Leaf): # Error reported by type checker
28432843
Sequence = _alias(collections.abc.Sequence, 1)
28442844
MutableSequence = _alias(collections.abc.MutableSequence, 1)
28452845
ByteString = _DeprecatedGenericAlias(
2846-
collections.abc.ByteString, 0, removal_version=(3, 14) # Not generic.
2846+
collections.abc.ByteString, 0, removal_version=(3, 17) # Not generic.
28472847
)
28482848
# Tuple accepts variable number of parameters.
28492849
Tuple = _TupleType(tuple, -1, inst=False, name='Tuple')

0 commit comments

Comments
 (0)