(original) (raw)

changeset: 69931:bcf04ced5ef1 branch: 2.7 parent: 69915:7c3a20b5943a user: Antoine Pitrou solipsis@pitrou.net date: Sat May 07 19:59:33 2011 +0200 files: Lib/smtplib.py Lib/test/test_smtpnet.py Misc/ACKS Misc/NEWS description: Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch by Kasun Herath. diff -r 7c3a20b5943a -r bcf04ced5ef1 Lib/smtplib.py --- a/Lib/smtplib.py Sat May 07 19:21:22 2011 +0300 +++ b/Lib/smtplib.py Sat May 07 19:59:33 2011 +0200 @@ -222,6 +222,7 @@ 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): @@ -237,7 +238,6 @@ """ self.timeout = timeout self.esmtp_features = {} - self.default_port = SMTP_PORT if host: (code, msg) = self.connect(host, port) if code != 220: @@ -756,13 +756,15 @@ 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: diff -r 7c3a20b5943a -r bcf04ced5ef1 Lib/test/test_smtpnet.py --- a/Lib/test/test_smtpnet.py Sat May 07 19:21:22 2011 +0300 +++ b/Lib/test/test_smtpnet.py Sat May 07 19:59:33 2011 +0200 @@ -17,6 +17,13 @@ server.ehlo() server.quit() + def test_connect_default_port(self): + test_support.get_attribute(smtplib, 'SMTP_SSL') + with test_support.transient_internet(self.testServer): + server = smtplib.SMTP_SSL(self.testServer) + server.ehlo() + server.quit() + def test_main(): test_support.run_unittest(SmtpSSLTest) diff -r 7c3a20b5943a -r bcf04ced5ef1 Misc/ACKS --- a/Misc/ACKS Sat May 07 19:21:22 2011 +0300 +++ b/Misc/ACKS Sat May 07 19:59:33 2011 +0200 @@ -337,6 +337,7 @@ Lance Finn Helsten Jonathan Hendry James Henstridge +Kasun Herath Chris Herborth Ivan Herman Jürgen Hermann diff -r 7c3a20b5943a -r bcf04ced5ef1 Misc/NEWS --- a/Misc/NEWS Sat May 07 19:21:22 2011 +0300 +++ b/Misc/NEWS Sat May 07 19:59:33 2011 +0200 @@ -77,6 +77,9 @@ 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. /solipsis@pitrou.net