traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Ville Skyttä 2020-05-23 03:50:58 +03:00 committed by GitHub
parent 6fad3e6b49
commit da51ba442c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Doc/library/smtplib.rst
View File

@ -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

6
Lib/smtplib.py
View File

@ -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)