[Python-checkins] r79290 - in python/branches/release31-maint: Lib/ssl.py Misc/NEWS

Mon Mar 22 16:09:31 CET 2010

Author: antoine.pitrou
Date: Mon Mar 22 16:09:31 2010
New Revision: 79290
Log:
Merged revisions 79287,79289 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r79287 | antoine.pitrou | 2010年03月22日 15:49:10 +0100 (lun., 22 mars 2010) | 13 lines
 
 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.
 ........
................
 r79289 | antoine.pitrou | 2010年03月22日 16:07:09 +0100 (lun., 22 mars 2010) | 3 lines
 
 Fix a blunder in r79287. This part is, obviously, poorly tested (if at all).
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/ssl.py
 python/branches/release31-maint/Misc/NEWS
Modified: python/branches/release31-maint/Lib/ssl.py
==============================================================================

--- python/branches/release31-maint/Lib/ssl.py	(original)
+++ python/branches/release31-maint/Lib/ssl.py	Mon Mar 22 16:09:31 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)
 
@@ -264,15 +257,7 @@
 raise ValueError(
 "non-zero flags not allowed in calls to recv_into() on %s" %
 self.__class__)
- while True:
- try:
- v = self.read(nbytes, buffer)
- return v
- except SSLError as x:
- if x.args[0] == SSL_ERROR_WANT_READ:
- continue
- else:
- raise x
+ return self.read(nbytes, buffer)
 else:
 return socket.recv_into(self, buffer, nbytes, flags)
 
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Mar 22 16:09:31 2010
@@ -17,6 +17,8 @@
 Library
 -------
 
+- Issue #3890: Fix recv() and recv_into() on non-blocking SSL sockets.
+
 - Issue #6716/2: Backslash-replace error output in compilall.
 
 Build
