gh-92611: Clarify planned removal version in PEP 594-deprecated modules (GH-92793...

As discussed in GH-92611 and GH-92564 and as a followup to PR GH-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 GH-92792 ; if we decide to backport that PR, the upgrade to using `deprecated-removed` on those functions can be moved to this one.
(cherry picked from commit 31fa41ed689528505c0e0cf25777773b7e81c834)

Co-authored-by: CAM Gerlach <CAM.Gerlach@Gerlach.CAM>

diff --git a/Doc/library/aifc.rst b/Doc/library/aifc.rst
index fa277857574a3a6c8fcfafbd6a3b2aa865872d91..9f20a30193fa70da90748031a8b1ca81e20c8bb1 100644 (file)
--- a/Doc/library/aifc.rst
+++ b/Doc/library/aifc.rst
@@ -13,7 +13,7 @@
    single: AIFF-C
 
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`aifc` module is deprecated
    (see :pep:`PEP 594 <594#aifc>` for details).
 

diff --git a/Doc/library/asynchat.rst b/Doc/library/asynchat.rst
index 7cc9d99779bbbb299e45ac89a04eedfe94943a71..4eb6a79d4dfbf2c9ad8a034f44616c875ea5e559 100644 (file)
--- a/Doc/library/asynchat.rst
+++ b/Doc/library/asynchat.rst
@@ -10,8 +10,8 @@
 
 **Source code:** :source:`Lib/asynchat.py`
 
-.. deprecated:: 3.6
-   :mod:`asynchat` will be removed in Python 3.12
+.. deprecated-removed:: 3.6 3.12
+   The :mod:`asynchat` module is deprecated
    (see :pep:`PEP 594 <594#asynchat>` for details).
    Please use :mod:`asyncio` instead.
 

diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst
index a732fd7ba4f152525dd5d7dd3c89bbbc42cb12df..0084d754419d09e2641d705770a5d6c7a85a11d8 100644 (file)
--- a/Doc/library/asyncore.rst
+++ b/Doc/library/asyncore.rst
@@ -13,8 +13,8 @@
 
 **Source code:** :source:`Lib/asyncore.py`
 
-.. deprecated:: 3.6
-   :mod:`asyncore` will be removed in Python 3.12
+.. deprecated-removed:: 3.6 3.12
+   The :mod:`asyncore` module is deprecated
    (see :pep:`PEP 594 <594#asyncore>` for details).
    Please use :mod:`asyncio` instead.
 

diff --git a/Doc/library/audioop.rst b/Doc/library/audioop.rst
index 649c99e796282c116250ca2de4995cf28a7451d0..1f96575d08f5b19e7565537be0bf4be3f60accdd 100644 (file)
--- a/Doc/library/audioop.rst
+++ b/Doc/library/audioop.rst
@@ -5,7 +5,7 @@
    :synopsis: Manipulate raw audio data.
    :deprecated:
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`audioop` module is deprecated
    (see :pep:`PEP 594 <594#audioop>` for details).
 

diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst
index 31c03dee91ea82e829e84b5964a1d9da026af25f..5976c90029c22a3399699b51cc35c78391153b85 100644 (file)
--- a/Doc/library/cgi.rst
+++ b/Doc/library/cgi.rst
@@ -15,7 +15,7 @@
    single: URL
    single: Common Gateway Interface
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`cgi` module is deprecated
    (see :pep:`PEP 594 <594#cgi>` for details and alternatives).
 

diff --git a/Doc/library/cgitb.rst b/Doc/library/cgitb.rst
index 3b0b106abacd50b4ffbb79b1af976849881655ad..7f00bcd55c1e53e6f9a90d643161ca6c475c75a5 100644 (file)
--- a/Doc/library/cgitb.rst
+++ b/Doc/library/cgitb.rst
@@ -16,7 +16,7 @@
    single: exceptions; in CGI scripts
    single: tracebacks; in CGI scripts
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`cgitb` module is deprecated
    (see :pep:`PEP 594 <594#cgitb>` for details).
 

diff --git a/Doc/library/chunk.rst b/Doc/library/chunk.rst
index 5a84c8904f71457a62e516b39fe0c5d71d0fbc32..3b88e55b1478824d1881b88851a022a47b4cbe9b 100644 (file)
--- a/Doc/library/chunk.rst
+++ b/Doc/library/chunk.rst
@@ -17,7 +17,7 @@
    single: Real Media File Format
    single: RMFF
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`chunk` module is deprecated
    (see :pep:`PEP 594 <594#chunk>` for details).
 

diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst
index e795f10f50eec33ce5ddfe3a067ef64b1bd830d3..efba4236bcbcccfe9b7b2d4266ccaf173c7a68e6 100644 (file)
--- a/Doc/library/crypt.rst
+++ b/Doc/library/crypt.rst
@@ -16,7 +16,7 @@
    single: crypt(3)
    pair: cipher; DES
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`crypt` module is deprecated
    (see :pep:`PEP 594 <594#crypt>` for details and alternatives).
    The :mod:`hashlib` module is a potential replacement for certain use cases.

diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst
index c17bf897b9be91bb451f6d578f4ce442c6e2caea..318fe650776d2a3fdc72536d05693d6fa97484e7 100644 (file)
--- a/Doc/library/imghdr.rst
+++ b/Doc/library/imghdr.rst
@@ -7,7 +7,7 @@
 
 **Source code:** :source:`Lib/imghdr.py`
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`imghdr` module is deprecated
    (see :pep:`PEP 594 <594#imghdr>` for details and alternatives).
 

diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
index 121a730e0c9b4a4f0d82e4ca9b6cbcc813018443..000793a7e66cae06bc0e143faec052a3ec9e0783 100644 (file)
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -7,7 +7,7 @@
 
 **Source code:** :source:`Lib/imp.py`
 
-.. deprecated:: 3.4
+.. deprecated-removed:: 3.4 3.12
    The :mod:`imp` module is deprecated in favor of :mod:`importlib`.
 
 .. index:: statement: import

diff --git a/Doc/library/mailcap.rst b/Doc/library/mailcap.rst
index e2e5bb34456373a399550da0f3e0845a67220320..5490c8468d7cf7891ddb39b818b3433e03c0381c 100644 (file)
--- a/Doc/library/mailcap.rst
+++ b/Doc/library/mailcap.rst
@@ -7,7 +7,7 @@
 
 **Source code:** :source:`Lib/mailcap.py`
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`mailcap` module is deprecated
    (see :pep:`PEP 594 <594#mailcap>` for details).
    The :mod:`mimetypes` module provides an alternative.

diff --git a/Doc/library/msilib.rst b/Doc/library/msilib.rst
index 1ee8130801cba5330e40539a2f14c7ce2d7c7eff..fbe55db9372300d5cd843508e07f1fb55d29e2ab 100644 (file)
--- a/Doc/library/msilib.rst
+++ b/Doc/library/msilib.rst
@@ -13,7 +13,7 @@
 
 .. index:: single: msi
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`msilib` module is deprecated
    (see :pep:`PEP 594 <594#msilib>` for details).
 

diff --git a/Doc/library/nis.rst b/Doc/library/nis.rst
index 49fe62954cce8a04ffd8f4973b077eb0e94bc75b..fd3c3d9293d2472a683284db74cf965b9b0a8e47 100644 (file)
--- a/Doc/library/nis.rst
+++ b/Doc/library/nis.rst
@@ -10,7 +10,7 @@
 .. moduleauthor:: Fred Gansevles <Fred.Gansevles@cs.utwente.nl>
 .. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`nis` module is deprecated
    (see :pep:`PEP 594 <594#nis>` for details).
 

diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
index 728ee3036057dd34c4a2a6803915e924865607c2..e14c1bf8d5367ef63540f2e42b31187275da77f9 100644 (file)
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -6,7 +6,7 @@
    :synopsis: Access to OSS-compatible audio devices.
    :deprecated:
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`ossaudiodev` module is deprecated
    (see :pep:`PEP 594 <594#ossaudiodev>` for details).
 

diff --git a/Doc/library/pipes.rst b/Doc/library/pipes.rst
index 1c5bb8bddaafbc9dda2492622f89d62152f6431d..245dd0d25208814a42adfbff44a90d8f678bb585 100644 (file)
--- a/Doc/library/pipes.rst
+++ b/Doc/library/pipes.rst
@@ -10,7 +10,7 @@
 
 **Source code:** :source:`Lib/pipes.py`
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`pipes` module is deprecated
    (see :pep:`PEP 594 <594#pipes>` for details).
    Please use the :mod:`subprocess` module instead.

diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index 121790b5ed0ddf2443d45bc73b1b16f237e169ca..a0d1fb0aa515299ba40804e67550f08667dce54a 100644 (file)
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -14,8 +14,8 @@
 
 This module offers several classes to implement SMTP (email) servers.
 
-.. deprecated:: 3.6
-   :mod:`smtpd` will be removed in Python 3.12
+.. deprecated-removed:: 3.6 3.12
+   The :mod:`smtpd` module is deprecated
    (see :pep:`PEP 594 <594#smtpd>` for details).
    The `aiosmtpd <https://aiosmtpd.readthedocs.io/>`_ package is a recommended
    replacement for this module.  It is based on :mod:`asyncio` and provides a

diff --git a/Doc/library/sndhdr.rst b/Doc/library/sndhdr.rst
index 3ca36f270dade14bc690a7f2b9d5b7065f015a12..e1dbe4a1a344834c309420394b6c89748c95edf1 100644 (file)
--- a/Doc/library/sndhdr.rst
+++ b/Doc/library/sndhdr.rst
@@ -14,7 +14,7 @@
    single: A-LAW
    single: u-LAW
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`sndhdr` module is deprecated
    (see :pep:`PEP 594 <594#sndhdr>` for details and alternatives).
 

diff --git a/Doc/library/spwd.rst b/Doc/library/spwd.rst
index 40f50de07babff30a04fe4cb0691bfcab7f37c69..87e09167ada4275b60f23f230d604136d2b6a4ad 100644 (file)
--- a/Doc/library/spwd.rst
+++ b/Doc/library/spwd.rst
@@ -6,7 +6,7 @@
    :synopsis: The shadow password database (getspnam() and friends).
    :deprecated:
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`spwd` module is deprecated
    (see :pep:`PEP 594 <594#spwd>` for details and alternatives).
 

diff --git a/Doc/library/sunau.rst b/Doc/library/sunau.rst
index b4d996e67e17cfacf28be22dfde9e46d8492396a..c7a38d96ade13102c21abb12ac20cd5352c6de7d 100644 (file)
--- a/Doc/library/sunau.rst
+++ b/Doc/library/sunau.rst
@@ -9,7 +9,7 @@
 
 **Source code:** :source:`Lib/sunau.py`
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`sunau` module is deprecated
    (see :pep:`PEP 594 <594#sunau>` for details).
 

diff --git a/Doc/library/telnetlib.rst b/Doc/library/telnetlib.rst
index 48a927c8ac96b2efbfa70b2d0cfa37c58fdd32ae..70b8c7d1511d09cced8b9f72f3f5feb612fa116a 100644 (file)
--- a/Doc/library/telnetlib.rst
+++ b/Doc/library/telnetlib.rst
@@ -11,7 +11,7 @@
 
 .. index:: single: protocol; Telnet
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`telnetlib` module is deprecated
    (see :pep:`PEP 594 <594#telnetlib>` for details and alternatives).
 

diff --git a/Doc/library/uu.rst b/Doc/library/uu.rst
index 026ec415c9da650925dde0985ae0be3ee3c1c128..83c4aec47bbefce3e5e8b398b0f0aec0fca9a5ad 100644 (file)
--- a/Doc/library/uu.rst
+++ b/Doc/library/uu.rst
@@ -9,7 +9,7 @@
 
 **Source code:** :source:`Lib/uu.py`
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`uu` module is deprecated
    (see :pep:`PEP 594 <594#uu-and-the-uu-encoding>` for details).
    :mod:`base64` is a modern alternative.

diff --git a/Doc/library/xdrlib.rst b/Doc/library/xdrlib.rst
index a3124a986524bd8344a9f3b7da671f52e4d0f7ea..39e75573260c50d48f3e1f2858c7dde54b327aa8 100644 (file)
--- a/Doc/library/xdrlib.rst
+++ b/Doc/library/xdrlib.rst
@@ -11,7 +11,7 @@
    single: XDR
    single: External Data Representation
 
-.. deprecated:: 3.11
+.. deprecated-removed:: 3.11 3.13
    The :mod:`xdrlib` module is deprecated
    (see :pep:`PEP 594 <594#xdrlib>` for details).