Skip to content

Commit 31fa41e

Browse files
authored
gh-92611: Clarify planned removal version in PEP 594-deprecated modules (GH-92793)
As discussed in #92611 and #92564 and as a followup to PR #92612 , this 3.11+ only PR uses the proper `deprecated-removed` role for the modules deprecated by PEP 593 (PEP-594) to clearly indicate to users that a removal version is planned and what it is, so they can prepare accordingly or voice any unanticipated impacts. Related to #92792 ; if we decide to backport that PR, the upgrade to using `deprecated-removed` on those functions can be moved to this one.
1 parent 87b9b4e commit 31fa41e

22 files changed

+25
-25
lines changed

Doc/library/aifc.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
single: AIFF-C
1414

1515

16-
.. deprecated:: 3.11
16+
.. deprecated-removed:: 3.11 3.13
1717
The :mod:`aifc` module is deprecated
1818
(see :pep:`PEP 594 <594#aifc>` for details).
1919

Doc/library/asynchat.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
**Source code:** :source:`Lib/asynchat.py`
1212

13-
.. deprecated:: 3.6
14-
:mod:`asynchat` will be removed in Python 3.12
13+
.. deprecated-removed:: 3.6 3.12
14+
The :mod:`asynchat` module is deprecated
1515
(see :pep:`PEP 594 <594#asynchat>` for details).
1616
Please use :mod:`asyncio` instead.
1717

Doc/library/asyncore.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
1414
**Source code:** :source:`Lib/asyncore.py`
1515

16-
.. deprecated:: 3.6
17-
:mod:`asyncore` will be removed in Python 3.12
16+
.. deprecated-removed:: 3.6 3.12
17+
The :mod:`asyncore` module is deprecated
1818
(see :pep:`PEP 594 <594#asyncore>` for details).
1919
Please use :mod:`asyncio` instead.
2020

Doc/library/audioop.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:synopsis: Manipulate raw audio data.
66
:deprecated:
77

8-
.. deprecated:: 3.11
8+
.. deprecated-removed:: 3.11 3.13
99
The :mod:`audioop` module is deprecated
1010
(see :pep:`PEP 594 <594#audioop>` for details).
1111

Doc/library/cgi.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
single: URL
1616
single: Common Gateway Interface
1717

18-
.. deprecated:: 3.11
18+
.. deprecated-removed:: 3.11 3.13
1919
The :mod:`cgi` module is deprecated
2020
(see :pep:`PEP 594 <594#cgi>` for details and alternatives).
2121

Doc/library/cgitb.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
single: exceptions; in CGI scripts
1717
single: tracebacks; in CGI scripts
1818

19-
.. deprecated:: 3.11
19+
.. deprecated-removed:: 3.11 3.13
2020
The :mod:`cgitb` module is deprecated
2121
(see :pep:`PEP 594 <594#cgitb>` for details).
2222

Doc/library/chunk.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
single: Real Media File Format
1818
single: RMFF
1919

20-
.. deprecated:: 3.11
20+
.. deprecated-removed:: 3.11 3.13
2121
The :mod:`chunk` module is deprecated
2222
(see :pep:`PEP 594 <594#chunk>` for details).
2323

Doc/library/crypt.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
single: crypt(3)
1717
pair: cipher; DES
1818

19-
.. deprecated:: 3.11
19+
.. deprecated-removed:: 3.11 3.13
2020
The :mod:`crypt` module is deprecated
2121
(see :pep:`PEP 594 <594#crypt>` for details and alternatives).
2222
The :mod:`hashlib` module is a potential replacement for certain use cases.

Doc/library/imghdr.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
**Source code:** :source:`Lib/imghdr.py`
99

10-
.. deprecated:: 3.11
10+
.. deprecated-removed:: 3.11 3.13
1111
The :mod:`imghdr` module is deprecated
1212
(see :pep:`PEP 594 <594#imghdr>` for details and alternatives).
1313

Doc/library/imp.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
**Source code:** :source:`Lib/imp.py`
99

10-
.. deprecated:: 3.4
10+
.. deprecated-removed:: 3.4 3.12
1111
The :mod:`imp` module is deprecated in favor of :mod:`importlib`.
1212

1313
.. index:: statement: import

Doc/library/mailcap.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
**Source code:** :source:`Lib/mailcap.py`
99

10-
.. deprecated:: 3.11
10+
.. deprecated-removed:: 3.11 3.13
1111
The :mod:`mailcap` module is deprecated
1212
(see :pep:`PEP 594 <594#mailcap>` for details).
1313
The :mod:`mimetypes` module provides an alternative.

Doc/library/msilib.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
.. index:: single: msi
1515

16-
.. deprecated:: 3.11
16+
.. deprecated-removed:: 3.11 3.13
1717
The :mod:`msilib` module is deprecated
1818
(see :pep:`PEP 594 <594#msilib>` for details).
1919

Doc/library/nis.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
.. moduleauthor:: Fred Gansevles <Fred.Gansevles@cs.utwente.nl>
1111
.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
1212

13-
.. deprecated:: 3.11
13+
.. deprecated-removed:: 3.11 3.13
1414
The :mod:`nis` module is deprecated
1515
(see :pep:`PEP 594 <594#nis>` for details).
1616

Doc/library/ossaudiodev.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:synopsis: Access to OSS-compatible audio devices.
77
:deprecated:
88

9-
.. deprecated:: 3.11
9+
.. deprecated-removed:: 3.11 3.13
1010
The :mod:`ossaudiodev` module is deprecated
1111
(see :pep:`PEP 594 <594#ossaudiodev>` for details).
1212

Doc/library/pipes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
**Source code:** :source:`Lib/pipes.py`
1212

13-
.. deprecated:: 3.11
13+
.. deprecated-removed:: 3.11 3.13
1414
The :mod:`pipes` module is deprecated
1515
(see :pep:`PEP 594 <594#pipes>` for details).
1616
Please use the :mod:`subprocess` module instead.

Doc/library/smtpd.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
This module offers several classes to implement SMTP (email) servers.
1616

17-
.. deprecated:: 3.6
18-
:mod:`smtpd` will be removed in Python 3.12
17+
.. deprecated-removed:: 3.6 3.12
18+
The :mod:`smtpd` module is deprecated
1919
(see :pep:`PEP 594 <594#smtpd>` for details).
2020
The `aiosmtpd <https://aiosmtpd.readthedocs.io/>`_ package is a recommended
2121
replacement for this module. It is based on :mod:`asyncio` and provides a

Doc/library/sndhdr.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
single: A-LAW
1515
single: u-LAW
1616

17-
.. deprecated:: 3.11
17+
.. deprecated-removed:: 3.11 3.13
1818
The :mod:`sndhdr` module is deprecated
1919
(see :pep:`PEP 594 <594#sndhdr>` for details and alternatives).
2020

Doc/library/spwd.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:synopsis: The shadow password database (getspnam() and friends).
77
:deprecated:
88

9-
.. deprecated:: 3.11
9+
.. deprecated-removed:: 3.11 3.13
1010
The :mod:`spwd` module is deprecated
1111
(see :pep:`PEP 594 <594#spwd>` for details and alternatives).
1212

Doc/library/sunau.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
**Source code:** :source:`Lib/sunau.py`
1111

12-
.. deprecated:: 3.11
12+
.. deprecated-removed:: 3.11 3.13
1313
The :mod:`sunau` module is deprecated
1414
(see :pep:`PEP 594 <594#sunau>` for details).
1515

Doc/library/telnetlib.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
.. index:: single: protocol; Telnet
1313

14-
.. deprecated:: 3.11
14+
.. deprecated-removed:: 3.11 3.13
1515
The :mod:`telnetlib` module is deprecated
1616
(see :pep:`PEP 594 <594#telnetlib>` for details and alternatives).
1717

Doc/library/uu.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
**Source code:** :source:`Lib/uu.py`
1111

12-
.. deprecated:: 3.11
12+
.. deprecated-removed:: 3.11 3.13
1313
The :mod:`uu` module is deprecated
1414
(see :pep:`PEP 594 <594#uu-and-the-uu-encoding>` for details).
1515
:mod:`base64` is a modern alternative.

Doc/library/xdrlib.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
single: XDR
1212
single: External Data Representation
1313

14-
.. deprecated:: 3.11
14+
.. deprecated-removed:: 3.11 3.13
1515
The :mod:`xdrlib` module is deprecated
1616
(see :pep:`PEP 594 <594#xdrlib>` for details).
1717

0 commit comments

Comments
 (0)