mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 72835 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72835 | r.david.murray | 2009-05-22 20:48:58 -0400 (Fri, 22 May 2009) | 4 lines

  Fix Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns
  the socket.  Patch by Farhan Ahmad, test by Marcin Bachry.
........
This commit is contained in:
R. David Murray 2009-05-23 01:30:26 +00:00
parent 0dedf45142
commit 87e2074ecb
4 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/smtplib.py
View file

@ -757,9 +757,10 @@ if _have_ssl:
def _get_socket(self, host, port, timeout):
if self.debuglevel > 0: print('connect:', (host, port), file=stderr)
self.sock = socket.create_connection((host, port), timeout)
self.sock = ssl.wrap_socket(self.sock, self.keyfile, self.certfile)
self.file = SSLFakeFile(self.sock)
new_socket = socket.create_connection((host, port), timeout)
new_socket = ssl.wrap_socket(new_socket, self.keyfile, self.certfile)
self.file = SSLFakeFile(new_socket)
return new_socket
__all__.append("SMTP_SSL")