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")
diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py
new file mode 100644
index 0000000..5ca4195
--- /dev/null
+++ b/Lib/test/test_smtpnet.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+
+import unittest
+from test import support
+import smtplib
+
+support.requires(
+ "network",
+ "use of network resource is not enabled and "
+ "test requires Internet access for communication with smtp.gmail.com:465",
+ )
+
+class SmtpSSLTest(unittest.TestCase):
+ testServer = 'smtp.gmail.com'
+ remotePort = 465
+
+ def test_connect(self):
+ server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
+ server.ehlo()
+ server.quit()
+
+def test_main():
+ support.run_unittest(SmtpSSLTest)
+
+if __name__ == "__main__":
+ test_main()
diff --git a/Misc/ACKS b/Misc/ACKS
index 8a86f73..f14d45d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -11,6 +11,7 @@
David Abrahams
Jim Ahlstrom
+Farhan Ahmad
Jyrki Alakuijala
Billy G. Allie
Kevin Altis
@@ -28,6 +29,7 @@
Donovan Baarda
Attila Babo
Alfonso Baciero
+Marcin Bachry
Dwayne Bailey
Stig Bakken
Greg Ball
diff --git a/Misc/NEWS b/Misc/NEWS
index ea5d090..19e2dea 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@
Library
-------
+- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket.
+ Patch by Farhan Ahmad, test by Marcin Bachry.
+
- Issue #2116: Weak references and weak dictionaries now support copy()ing and
deepcopy()ing.