diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-05-23 01:30:26 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-05-23 01:30:26 (GMT) |
| commit | 87e2074ecb1394d7a123151432813bf608247f9c (patch) | |
| tree | 643199c7b74afad6ac0aaf6970f0d7d7457a68c3 /Lib/smtplib.py | |
| parent | 0dedf451428c174db89963a74e6c230420c811e4 (diff) | |
| download | cpython-87e2074ecb1394d7a123151432813bf608247f9c.zip cpython-87e2074ecb1394d7a123151432813bf608247f9c.tar.gz cpython-87e2074ecb1394d7a123151432813bf608247f9c.tar.bz2 | |
Merged revisions 72835 via svnmerge from
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.
........
Diffstat (limited to 'Lib/smtplib.py')
| -rwxr-xr-x | Lib/smtplib.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 0a12a97..d8d717c 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -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") |