From edd6c7acbe0fb24a27a63961a9f55963b25a5e87 Mon Sep 17 00:00:00 2001 From: liris Date: Mon, 9 Sep 2013 08:43:22 +0900 Subject: - fixed #51 - python 3.3 doesn't raise SSLError for timeout. --- websocket.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/websocket.py b/websocket.py index 67e27c4..aadc08f 100644 --- a/websocket.py +++ b/websocket.py @@ -730,22 +730,13 @@ class WebSocket(object): return self.sock.send(data) except socket.timeout as e: raise WebSocketTimeoutException(*e.args) - except SSLError as e: - if "timed out" in e.args[0]: - raise WebSocketTimeoutException(*e.args) - else: - raise def _recv(self, bufsize): try: bytes = self.sock.recv(bufsize) except socket.timeout as e: raise WebSocketTimeoutException(*e.args) - except SSLError as e: - if e.args[0] == "The read operation timed out": - raise WebSocketTimeoutException(*e.args) - else: - raise + if not bytes: raise WebSocketConnectionClosedException() return bytes -- cgit v1.2.1