Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch by Kasun Herath.

This commit is contained in:
Antoine Pitrou 2011-05-07 19:39:37 +02:00
parent 63e4230c38
commit c1d520634a
4 changed files with 15 additions and 2 deletions

View File

@ -219,6 +219,7 @@ class SMTP:
ehlo_msg = "ehlo"
ehlo_resp = None
does_esmtp = 0
default_port = SMTP_PORT
def __init__(self, host='', port=0, local_hostname=None,
timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
@ -234,7 +235,6 @@ class SMTP:
"""
self.timeout = timeout
self.esmtp_features = {}
self.default_port = SMTP_PORT
if host:
(code, msg) = self.connect(host, port)
if code != 220:
@ -749,13 +749,15 @@ if _have_ssl:
are also optional - they can contain a PEM formatted private key and
certificate chain file for the SSL connection.
"""
default_port = SMTP_SSL_PORT
def __init__(self, host='', port=0, local_hostname=None,
keyfile=None, certfile=None,
timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
self.keyfile = keyfile
self.certfile = certfile
SMTP.__init__(self, host, port, local_hostname, timeout)
self.default_port = SMTP_SSL_PORT
def _get_socket(self, host, port, timeout):
if self.debuglevel > 0: print('connect:', (host, port), file=stderr)

View File

@ -17,6 +17,13 @@ class SmtpSSLTest(unittest.TestCase):
server.ehlo()
server.quit()
def test_connect_default_port(self):
support.get_attribute(smtplib, 'SMTP_SSL')
with support.transient_internet(self.testServer):
server = smtplib.SMTP_SSL(self.testServer)
server.ehlo()
server.quit()
def test_main():
support.run_unittest(SmtpSSLTest)

View File

@ -335,6 +335,7 @@ Malte Helmert
Lance Finn Helsten
Jonathan Hendry
James Henstridge
Kasun Herath
Chris Herborth
Ivan Herman
Jürgen Hermann

View File

@ -66,6 +66,9 @@ Core and Builtins
Library
-------
- Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch
by Kasun Herath.
- Issue 11999: fixed sporadic sync failure mailbox.Maildir due to its trying to
detect mtime changes by comparing to the system clock instead of to the
previous value of the mtime.