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.
........
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 @@
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")