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

Merge: Issue #11927: SMTP_SSL now uses port 465 by default as documented.
---

5bcc50c1b55527c18f91ca13d90d05a221b91a65
diff --cc Lib/smtplib.py
index 14e62504d320,2c2141b167c6..dbccf4898210
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@@ -810,11 -758,9 +813,10 @@@ if _have_ssl
              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)
 +            if self.debuglevel > 0:
 +                print('connect:', (host, port), file=stderr)
              new_socket = socket.create_connection((host, port), timeout)
              new_socket = ssl.wrap_socket(new_socket, self.keyfile, self.certfile)
              self.file = SSLFakeFile(new_socket)