Index: Lib/ssl.py =================================================================== --- Lib/ssl.py (revision 67068) +++ Lib/ssl.py (working copy) @@ -210,16 +210,9 @@ if self._sslobj: if flags != 0: raise ValueError( - "non-zero flags not allowed in calls to sendall() on %s" % + "non-zero flags not allowed in calls to recv() on %s" % self.__class__) - while True: - try: - return self.read(buflen) - except SSLError, x: - if x.args[0] == SSL_ERROR_WANT_READ: - continue - else: - raise x + return self.read(buflen) else: return socket.recv(self, buflen, flags) @@ -233,17 +226,10 @@ raise ValueError( "non-zero flags not allowed in calls to recv_into() on %s" % self.__class__) - while True: - try: - tmp_buffer = self.read(nbytes) - v = len(tmp_buffer) - buffer[:v] = tmp_buffer - return v - except SSLError as x: - if x.args[0] == SSL_ERROR_WANT_READ: - continue - else: - raise x + tmp_buffer = self.read(nbytes) + v = len(tmp_buffer) + buffer[:v] = tmp_buffer + return v else: return socket.recv_into(self, buffer, nbytes, flags)