summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliris <liris.pp@gmail.com>2013-09-09 08:43:22 +0900
committerliris <liris.pp@gmail.com>2013-09-09 08:43:22 +0900
commitedd6c7acbe0fb24a27a63961a9f55963b25a5e87 (patch)
tree578c9c537f60bbe7ae31066c68029d6105901b7c
parentd7f7a190c0b1ebfc26b36cfa157900109ee3218b (diff)
downloadwebsocket-client-edd6c7acbe0fb24a27a63961a9f55963b25a5e87.tar.gz
- fixed #51
- python 3.3 doesn't raise SSLError for timeout.
-rw-r--r--websocket.py11
1 files changed, 1 insertions, 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