[Python-checkins] r72842 - in python/branches/release30-maint: Lib/smtplib.py Lib/test/test_smtpnet.py Misc/ACKS Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Sat May 23 04:37:55 2009
New Revision: 72842

Log:
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.
  ........
................


Added:
   python/branches/release30-maint/Lib/test/test_smtpnet.py
      - copied unchanged from r72836, /python/branches/py3k/Lib/test/test_smtpnet.py
Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/smtplib.py
   python/branches/release30-maint/Misc/ACKS
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/smtplib.py
==============================================================================
--- python/branches/release30-maint/Lib/smtplib.py	(original)
+++ python/branches/release30-maint/Lib/smtplib.py	Sat May 23 04:37:55 2009
@@ -754,9 +754,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")
 

Modified: python/branches/release30-maint/Misc/ACKS
==============================================================================
--- python/branches/release30-maint/Misc/ACKS	(original)
+++ python/branches/release30-maint/Misc/ACKS	Sat May 23 04:37:55 2009
@@ -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
@@ -165,6 +167,7 @@
 Raghuram Devarakonda
 Toby Dickenson
 Mark Dickinson
+Daniel Diniz
 Humberto Diogenes
 Yves Dionne
 Daniel Dittmar

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Sat May 23 04:37:55 2009
@@ -62,6 +62,9 @@
 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.