From dc3017dbc75e8f1d535f1696a12b27d1f1000324 Mon Sep 17 00:00:00 2001 From: liris Date: Tue, 24 Feb 2015 09:50:05 +0900 Subject: [PATCH] fixed #152 - set error message. --- ChangeLog | 4 ++++ websocket/_app.py | 4 ++-- websocket/_core.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ca51b8..dbb851b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ ChangeLog ============ +- 0.26.0 + + - all WebSocketException provide message string (#152) + - 0.25.0 - fixed for Python 2.6(#151) diff --git a/websocket/_app.py b/websocket/_app.py index 160563c..c2d3c7d 100644 --- a/websocket/_app.py +++ b/websocket/_app.py @@ -96,7 +96,7 @@ class WebSocketApp(object): """ if not self.sock or self.sock.send(data, opcode) == 0: - raise WebSocketConnectionClosedException() + raise WebSocketConnectionClosedException("Connection is already closed.") def close(self): """ @@ -164,7 +164,7 @@ class WebSocketApp(object): break if ping_timeout and self.last_ping_tm and time.time() - self.last_ping_tm > ping_timeout: self.last_ping_tm = 0 - raise WebSocketTimeoutException() + raise WebSocketTimeoutException("ping timed out") if r: op_code, frame = self.sock.recv_data_frame(True) diff --git a/websocket/_core.py b/websocket/_core.py index fb7bad0..c27ca14 100644 --- a/websocket/_core.py +++ b/websocket/_core.py @@ -952,7 +952,7 @@ class WebSocket(object): self.sock.close() self.sock = None self.connected = False - raise WebSocketConnectionClosedException() + raise WebSocketConnectionClosedException("Connection is already closed.") return bytes def _recv_strict(self, bufsize):