[3.10] bpo-47022: Document asynchat, asyncore and smtpd removals in 3.12 (GH-31891...

Document the deprecation of asyncore, asynchat, and smtpd with a slated removal in Python 3.12 thanks to PEP 594..
(cherry picked from commit 77473846439b8a3eae66de1a1cfe931619f38513)

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>

diff --git a/Doc/library/asynchat.rst b/Doc/library/asynchat.rst
index 9e51416b83a570b45964431e85ef8b07070b27f5..4354444a1d3314a57d63dd5c38f15034143bd378 100644 (file)
--- a/Doc/library/asynchat.rst
+++ b/Doc/library/asynchat.rst
@@ -3,6 +3,7 @@
 
 .. module:: asynchat
    :synopsis: Support for asynchronous command/response protocols.
+   :deprecated:
 
 .. moduleauthor:: Sam Rushing <rushing@nightmare.com>
 .. sectionauthor:: Steve Holden <sholden@holdenweb.com>
@@ -10,6 +11,7 @@
 **Source code:** :source:`Lib/asynchat.py`
 
 .. deprecated:: 3.6
+   :mod:`asynchat` will be removed in Python 3.12 (:pep:`594`).
    Please use :mod:`asyncio` instead.
 
 --------------

diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst
index a86518ebff2777eb12e75fb361950392145a2699..e481e13db76f70204b0990839170d9050bce22d1 100644 (file)
--- a/Doc/library/asyncore.rst
+++ b/Doc/library/asyncore.rst
@@ -4,6 +4,7 @@
 .. module:: asyncore
    :synopsis: A base class for developing asynchronous socket handling
               services.
+   :deprecated:
 
 .. moduleauthor:: Sam Rushing <rushing@nightmare.com>
 .. sectionauthor:: Christopher Petrilli <petrilli@amber.org>
@@ -13,6 +14,7 @@
 **Source code:** :source:`Lib/asyncore.py`
 
 .. deprecated:: 3.6
+   :mod:`asyncore` will be removed in Python 3.12 (:pep:`594`).
    Please use :mod:`asyncio` instead.
 
 --------------

diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index 803430f1bde1734f89ec37a8a843bb9cd0675c5e..a39bc024047fd34681e17b17e747dc874d1d35a0 100644 (file)
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -3,6 +3,7 @@
 
 .. module:: smtpd
    :synopsis: A SMTP server implementation in Python.
+   :deprecated:
 
 .. moduleauthor:: Barry Warsaw <barry@python.org>
 .. sectionauthor:: Moshe Zadka <moshez@moshez.org>
@@ -14,6 +15,7 @@
 This module offers several classes to implement SMTP (email) servers.
 
 .. deprecated:: 3.6
+   :mod:`smtpd` will be removed in Python 3.12 (:pep:`594`).
    The `aiosmtpd <https://aiosmtpd.readthedocs.io/>`_ package is a recommended
    replacement for this module.  It is based on :mod:`asyncio` and provides a
    more straightforward API.

diff --git a/Doc/library/superseded.rst b/Doc/library/superseded.rst
index 50a5983236e76ae605e2399383c2f8f83ff66a2b..fd23e4d1536d389174d73707a62d90611a2be8eb 100644 (file)
--- a/Doc/library/superseded.rst
+++ b/Doc/library/superseded.rst
@@ -10,5 +10,8 @@ backwards compatibility. They have been superseded by other modules.
 
 .. toctree::
 
-   optparse.rst
+   asynchat.rst
+   asyncore.rst
+   smtpd.rst
    imp.rst
+   optparse.rst

diff --git a/Lib/asynchat.py b/Lib/asynchat.py
index de26ffa648ffecd3b98beebd45e0846267e6edd7..e081e67c75acb01332bee52dcc05e81eac34d436 100644 (file)
--- a/Lib/asynchat.py
+++ b/Lib/asynchat.py
@@ -50,7 +50,7 @@ from collections import deque
 
 from warnings import warn
 warn(
-    'The asynchat module is deprecated. '
+    'The asynchat module is deprecated and will be removed in Python 3.12. '
     'The recommended replacement is asyncio',
     DeprecationWarning,
     stacklevel=2)

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index b1eea4bf652118498a0664152d3f87ca1807283d..a360d404395e5b1623b1b1393839b1174afd1865 100644 (file)
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -58,7 +58,7 @@ from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, EINVAL, \
      errorcode
 
 warnings.warn(
-    'The asyncore module is deprecated. '
+    'The asyncore module is deprecated and will be removed in Python 3.12. '
     'The recommended replacement is asyncio',
     DeprecationWarning,
     stacklevel=2)

diff --git a/Lib/smtpd.py b/Lib/smtpd.py
index bc4333125100975161b4ad154eac63ddca8c498f..963e0a7689c269fe0998127946ec190cf8d1a1c1 100755 (executable)
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -93,7 +93,8 @@ __all__ = [
 ]
 
 warn(
-    'The smtpd module is deprecated and unmaintained.  Please see aiosmtpd '
+    'The smtpd module is deprecated and unmaintained and will be removed '
+    'in Python 3.12.  Please see aiosmtpd '
     '(https://aiosmtpd.readthedocs.io/) for the recommended replacement.',
     DeprecationWarning,
     stacklevel=2)

diff --git a/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst b/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst
new file mode 100644 (file)
index 0000000..0e867b9
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-03-15-09-29-52.bpo-47022.uaEDcI.rst
@@ -0,0 +1,4 @@
+The :mod:`asynchat`, :mod:`asyncore` and  :mod:`smtpd` modules have been
+deprecated since at least Python 3.6. Their documentation and deprecation
+warnings and have now been updated to note they will removed in Python 3.12
+(:pep:`594`).