From: Barry Warsaw <barry@python.org>
Date: Fri, 24 Feb 2017 20:31:48 +0000 (-0500)
Subject: bpo-25008: Deprecate smtpd and point to aiosmtpd (#274) (#280)
X-Git-Tag: v3.4.7rc1~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f37b0cb230069481609b0bb06891b5dd26320504;p=thirdparty%2FPython%2Fcpython.git

bpo-25008: Deprecate smtpd and point to aiosmtpd (#274) (#280)
---

diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index 3ebed0626094..78f9d7feec49 100644
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -13,6 +13,12 @@
 
 This module offers several classes to implement SMTP (email) servers.
 
+.. seealso::
+
+    The `aiosmtpd <http://aiosmtpd.readthedocs.io/>`_ package is a recommended
+    replacement for this module.  It is based on :mod:`asyncio` and provides a
+    more straightforward API.  :mod:`smtpd` should be considered deprecated.
+
 Several server implementations are present; one is a generic
 do-nothing implementation, which can be overridden, while the other two offer
 specific mail-sending strategies.
diff --git a/Misc/NEWS b/Misc/NEWS
index 7acaf2fd50e2..d9e691b2496b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,12 @@ Release date: XXXX-XX-XX
 Core and Builtins
 -----------------
 
+Documentation
+-------------
+
+- bpo-25008: Document smtpd.py as effectively deprecated and add a pointer to
+  aiosmtpd, a third-party asyncio-based replacement.
+
 Library
 -------