From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 7 May 2011 17:39:37 +0000 (+0200)
Subject: Issue #11927: SMTP_SSL now uses port 465 by default as documented.  Patch by Kasun... 
X-Git-Tag: v3.2.1b1~3^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1d520634a25fac5dea41f3af70273fc0b3a11ae;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index a01a184c9f9c..2c2141b167c6 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -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)
diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py
index 6634df783bc5..1571ca36f615 100644
--- a/Lib/test/test_smtpnet.py
+++ b/Lib/test/test_smtpnet.py
@@ -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)
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 59b36615391f..80fda108c7b7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -335,6 +335,7 @@ Malte Helmert
 Lance Finn Helsten
 Jonathan Hendry
 James Henstridge
+Kasun Herath
 Chris Herborth
 Ivan Herman
 Jürgen Hermann
diff --git a/Misc/NEWS b/Misc/NEWS
index fddaf099c4cc..4be61cf33325 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.