diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2020-05-23 00:50:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-23 00:50:58 (GMT) |
| commit | da51ba442c7bf717872633676207c1ae10e99c99 (patch) | |
| tree | 5ef52f91f48dddfcc9fff62475824549661da90c | |
| parent | 6fad3e6b49f6a9f8b8a6635c41371e4451479f86 (diff) | |
| download | cpython-da51ba442c7bf717872633676207c1ae10e99c99.zip cpython-da51ba442c7bf717872633676207c1ae10e99c99.tar.gz cpython-da51ba442c7bf717872633676207c1ae10e99c99.tar.bz2 | |
Cosmetic smtplib changes (GH-8718)
Some cosmetic smtplib changes here. Let me know if you'd like a bpo/news entry or splitting this PR into two.
Automerge-Triggered-By: @maxking
| -rw-r--r-- | Doc/library/smtplib.rst | 7 | ||||
| -rwxr-xr-x | Lib/smtplib.py | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index a88e358..b3cc603 100644 --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -279,9 +279,10 @@ An :class:`SMTP` instance has the following methods: response for ESMTP option and store them for use by :meth:`has_extn`. Also sets several informational attributes: the message returned by the server is stored as the :attr:`ehlo_resp` attribute, :attr:`does_esmtp` - is set to true or false depending on whether the server supports ESMTP, and - :attr:`esmtp_features` will be a dictionary containing the names of the - SMTP service extensions this server supports, and their parameters (if any). + is set to ``True`` or ``False`` depending on whether the server supports + ESMTP, and :attr:`esmtp_features` will be a dictionary containing the names + of the SMTP service extensions this server supports, and their parameters + (if any). Unless you wish to use :meth:`has_extn` before sending mail, it should not be necessary to call this method explicitly. It will be implicitly called by diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 7808ba0..e2dbbbc 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -222,7 +222,7 @@ class SMTP: helo_resp = None ehlo_msg = "ehlo" ehlo_resp = None - does_esmtp = 0 + does_esmtp = False default_port = SMTP_PORT def __init__(self, host='', port=0, local_hostname=None, @@ -452,7 +452,7 @@ class SMTP: self.ehlo_resp = msg if code != 250: return (code, msg) - self.does_esmtp = 1 + self.does_esmtp = True #parse the ehlo response -ddm assert isinstance(self.ehlo_resp, bytes), repr(self.ehlo_resp) resp = self.ehlo_resp.decode("latin-1").split('\n') @@ -781,7 +781,7 @@ class SMTP: self.helo_resp = None self.ehlo_resp = None self.esmtp_features = {} - self.does_esmtp = 0 + self.does_esmtp = False else: # RFC 3207: # 501 Syntax error (no parameters allowed) |