[Python-checkins] r72836 - in python/branches/py3k: Lib/smtplib.py Lib/test/test_smtpnet.py Misc/ACKS Misc/NEWS

Sat May 23 03:30:26 CEST 2009

Author: r.david.murray
Date: Sat May 23 03:30:26 2009
New Revision: 72836
Log:
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 (2009年5月22日) | 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/py3k/Lib/test/test_smtpnet.py
 - copied, changed from r72835, /python/trunk/Lib/test/test_smtpnet.py
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/smtplib.py
 python/branches/py3k/Misc/ACKS
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/smtplib.py
==============================================================================

--- python/branches/py3k/Lib/smtplib.py	(original)
+++ python/branches/py3k/Lib/smtplib.py	Sat May 23 03:30:26 2009
@@ -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")
 
Copied: python/branches/py3k/Lib/test/test_smtpnet.py (from r72835, /python/trunk/Lib/test/test_smtpnet.py)
==============================================================================
--- /python/trunk/Lib/test/test_smtpnet.py	(original)
+++ python/branches/py3k/Lib/test/test_smtpnet.py	Sat May 23 03:30:26 2009
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
 import unittest
-from test import test_support
+from test import support
 import smtplib
 
-test_support.requires(
+support.requires(
 "network",
 "use of network resource is not enabled and "
 "test requires Internet access for communication with smtp.gmail.com:465",
@@ -20,7 +20,7 @@
 server.quit()
 
 def test_main():
- test_support.run_unittest(SmtpSSLTest)
+ support.run_unittest(SmtpSSLTest)
 
 if __name__ == "__main__":
 test_main()
Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Sat May 23 03:30:26 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
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat May 23 03:30:26 2009
@@ -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.
 
