python · miss-islington · Aug 6, 2022 · May 26, 2022 · Jun 4, 2022 · Jun 4, 2022
@@ -147,6 +147,3 @@ Legacy API:
   Module :mod:`mailbox`
      Tools for creating, reading, and managing collections of messages on disk
      using a variety standard formats.
-
-   Module :mod:`smtpd`
-      SMTP server framework (primarily useful for testing)
diff --git a/Doc/library/superseded.rst b/Doc/library/superseded.rst
@@ -27,7 +27,6 @@ backwards compatibility. They have been superseded by other modules.
   optparse.rst
   ossaudiodev.rst
   pipes.rst
-   smtpd.rst
   sndhdr.rst
   spwd.rst
   sunau.rst

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -115,6 +115,13 @@ Removed

  (Contributed by Erlend E. Aasland in :gh:`92548`)

+* :mod:`smtpd`, deprecated in Python 3.4.7 and 3.5.4, is now removed according
+  to :pep:`594` schedule. Use aiosmtpd_ PyPI module or any other
+  :keyword:`async`/:keyword:`await`-based server instead.
+  (Contributed by Oleg Iarygin in :gh:`93243`.)
+
+.. _aiosmtpd: https://pypi.org/project/aiosmtpd/
+

 Porting to Python 3.12
 ======================
@@ -140,6 +147,10 @@ Changes in the Python API
  select from a larger range than ``randrange(10**25)``.
  (Originally suggested by Serhiy Storchaka gh-86388.)

+* Removed strictly synchronous smtpd module, deprecated in Python 3.4.7 and
+  3.5.4.  A recommended replacement is the
+  :keyword:`async`/:keyword:`await`-based aiosmtpd_ PyPI module.
+

 Build Changes
 =============

diff --git a/Lib/smtpd.py → Lib/_smtpd.py b/Lib/smtpd.py → Lib/_smtpd.py
diff --git a/Lib/test/mock_socket.py b/Lib/test/mock_socket.py
@@ -1,4 +1,4 @@
-"""Mock socket module used by the smtpd and smtplib tests.
+"""Mock socket module used by smtplib tests.
 """

 # imported for _GLOBAL_DEFAULT_TIMEOUT
@@ -33,7 +33,7 @@ def close(self):


 class MockSocket:
-    """Mock socket object used by smtpd and smtplib tests.
+    """Mock socket object used by smtplib tests.
    """
    def __init__(self, family=None):
        global _reply_data

@@ -62,7 +62,7 @@


 asyncore = warnings_helper.import_deprecated('asyncore')
-smtpd = warnings_helper.import_deprecated('smtpd')
+smtpd = warnings_helper.import_deprecated('_smtpd')


 try:
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    """Mock socket module used by the smtpd and smtplib tests.
+    """Mock socket module used by smtplib tests.
                   arhadthedev marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
     """
     # imported for _GLOBAL_DEFAULT_TIMEOUT
@@ -33,7 +33,7 @@ def close(self):
     class MockSocket:
-        """Mock socket object used by smtpd and smtplib tests.
+        """Mock socket object used by smtplib tests.
                   arhadthedev marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
         """
         def __init__(self, family=None):
             global _reply_data
-          Expand Down