[Python-checkins] r79287 - in python/branches/py3k: Lib/ssl.py Lib/test/test_ftplib.py Misc/NEWS

Mon Mar 22 15:49:10 CET 2010

Author: antoine.pitrou
Date: Mon Mar 22 15:49:10 2010
New Revision: 79287
Log:
Merged revisions 79226,79286 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r79226 | antoine.pitrou | 2010年03月21日 20:33:38 +0100 (dim., 21 mars 2010) | 4 lines
 
 Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
........
 r79286 | antoine.pitrou | 2010年03月22日 15:41:48 +0100 (lun., 22 mars 2010) | 3 lines
 
 Fix an occasional test_ftplib failure, following r79226.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/ssl.py
 python/branches/py3k/Lib/test/test_ftplib.py
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/ssl.py
==============================================================================

--- python/branches/py3k/Lib/ssl.py	(original)
+++ python/branches/py3k/Lib/ssl.py	Mon Mar 22 15:49:10 2010
@@ -240,16 +240,9 @@
 if self._sslobj:
 if flags != 0:
 raise ValueError(
- "non-zero flags not allowed in calls to recv_into() on %s" %
- self.__class__)
- while True:
- try:
- return self.read(buflen)
- except SSLError as x:
- if x.args[0] == SSL_ERROR_WANT_READ:
- continue
- else:
- raise x
+ "non-zero flags not allowed in calls to recv() on %s" %
+ self.__class__)
+ return self.read(buflen)
 else:
 return socket.recv(self, buflen, flags)
 
@@ -273,6 +266,7 @@
 continue
 else:
 raise x
+ return self.read(nbytes, buffer)
 else:
 return socket.recv_into(self, buffer, nbytes, flags)
 
Modified: python/branches/py3k/Lib/test/test_ftplib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ftplib.py	(original)
+++ python/branches/py3k/Lib/test/test_ftplib.py	Mon Mar 22 15:49:10 2010
@@ -296,7 +296,9 @@
 try:
 return super(SSLConnection, self).send(data)
 except ssl.SSLError as err:
- if err.args[0] in (ssl.SSL_ERROR_EOF, ssl.SSL_ERROR_ZERO_RETURN):
+ if err.args[0] in (ssl.SSL_ERROR_EOF, ssl.SSL_ERROR_ZERO_RETURN,
+ ssl.SSL_ERROR_WANT_READ,
+ ssl.SSL_ERROR_WANT_WRITE):
 return 0
 raise
 
@@ -304,6 +306,9 @@
 try:
 return super(SSLConnection, self).recv(buffer_size)
 except ssl.SSLError as err:
+ if err.args[0] in (ssl.SSL_ERROR_WANT_READ,
+ ssl.SSL_ERROR_WANT_WRITE):
+ return ''
 if err.args[0] in (ssl.SSL_ERROR_EOF, ssl.SSL_ERROR_ZERO_RETURN):
 self.handle_close()
 return b''
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Mon Mar 22 15:49:10 2010
@@ -287,6 +287,8 @@
 Library
 -------
 
+- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
+
 - Issue #4282: Fix the main function of the profile module for a non-ASCII
 script, open the file in binary mode and not in text mode with the default
 (utf8) encoding.
