From: R. David Murray <rdmurray@bitdance.com>
Date: Sat, 23 May 2009 02:37:55 +0000 (+0000)
Subject: Merged revisions 72836 via svnmerge from
X-Git-Tag: 3.0~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e43c708f5fd984c1791db3329bd8254223c0ae7;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 72836 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72836 | r.david.murray | 2009-05-22 21:30:26 -0400 (Fri, 22 May 2009) | 10 lines

  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 d59e6b14709e..acbbf67194bf 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -754,9 +754,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")
 
diff --git a/Lib/test/test_smtpnet.py b/Lib/test/test_smtpnet.py
new file mode 100644
index 000000000000..5ca4195b9a07
--- /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 fa556698e987..d267be253818 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -11,6 +11,7 @@ PS: In the standard Python distribution, this file is encoded in Latin-1.
 
 David Abrahams
 Jim Ahlstrom
+Farhan Ahmad
 Jyrki Alakuijala
 Billy G. Allie
 Kevin Altis
@@ -28,6 +29,7 @@ Jan-Hein B"uhrman
 Donovan Baarda
 Attila Babo
 Alfonso Baciero
+Marcin Bachry
 Dwayne Bailey
 Stig Bakken
 Greg Ball
@@ -165,6 +167,7 @@ Roger Dev
 Raghuram Devarakonda
 Toby Dickenson
 Mark Dickinson
+Daniel Diniz
 Humberto Diogenes
 Yves Dionne
 Daniel Dittmar
diff --git a/Misc/NEWS b/Misc/NEWS
index 4162327a543c..668786fe4079 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -62,6 +62,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket.
+  Patch by Farhan Ahmad, test by Marcin Bachry.
+
 - Issue #5955: aifc's close method did not close the file it wrapped,
   now it does.  This also means getfp method now returns the real fp.