(original) (raw)

changeset: 69925:e708a57de190 parent: 69918:20273f2195ba parent: 69924:209744660b92 user: Antoine Pitrou solipsis@pitrou.net date: Sat May 07 19:42:39 2011 +0200 files: Lib/smtplib.py Misc/ACKS Misc/NEWS description: Merge: Issue #11927: SMTP_SSL now uses port 465 by default as documented. diff -r 20273f2195ba -r e708a57de190 Lib/smtplib.py --- a/Lib/smtplib.py Sat May 07 19:51:47 2011 +0300 +++ b/Lib/smtplib.py Sat May 07 19:42:39 2011 +0200 @@ -231,6 +231,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): @@ -246,7 +247,6 @@ """ self.timeout = timeout self.esmtp_features = {} - self.default_port = SMTP_PORT if host: (code, msg) = self.connect(host, port) if code != 220: @@ -817,13 +817,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 20273f2195ba -r e708a57de190 Lib/test/test_smtpnet.py --- a/Lib/test/test_smtpnet.py Sat May 07 19:51:47 2011 +0300 +++ b/Lib/test/test_smtpnet.py Sat May 07 19:42:39 2011 +0200 @@ -17,6 +17,13 @@ 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) diff -r 20273f2195ba -r e708a57de190 Misc/ACKS --- a/Misc/ACKS Sat May 07 19:51:47 2011 +0300 +++ b/Misc/ACKS Sat May 07 19:42:39 2011 +0200 @@ -371,6 +371,7 @@ Lance Finn Helsten Jonathan Hendry James Henstridge +Kasun Herath Chris Herborth Ivan Herman Jürgen Hermann diff -r 20273f2195ba -r e708a57de190 Misc/NEWS --- a/Misc/NEWS Sat May 07 19:51:47 2011 +0300 +++ b/Misc/NEWS Sat May 07 19:42:39 2011 +0200 @@ -140,6 +140,9 @@ Library ------- +- Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch + by Kasun Herath. + - Issue 11916: Add a number of MacOSX specific definitions to the errno module. Patch by Pierre Carrier. /solipsis@pitrou.net