From: Barry Warsaw <barry@python.org>
Date: Fri, 24 Feb 2017 19:05:59 +0000 (-0500)
Subject: bpo-25008: Deprecate smtpd and point to aiosmtpd (#274)
X-Git-Tag: v3.7.0a1~1288
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fba79dc568030091f84110fccac4cb64c2fef020;p=python

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

* bpo-25008: Deprecate smtpd and point to aiosmtpd.

* Simplify the aiosmtpd URL.
---

diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
index e383201aab..85ee8a75cf 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 72d96e7ef5..faae5f7e2a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -735,6 +735,9 @@ C API
 Documentation
 -------------
 
+- bpo-25008: Document smtpd.py as effectively deprecated and add a pointer to
+  aiosmtpd, a third-party asyncio-based replacement.
+
 - Issue #26355: Add canonical header link on each page to corresponding major
   version of the documentation. Patch by Matthias Bussonnier.