From f820493f336d9a565d9d5bd7610e4e99e37a279e Mon Sep 17 00:00:00 2001 From: liris Date: Tue, 2 Dec 2014 12:20:22 +0900 Subject: [PATCH] fixed error code extraction on python3 --- websocket/_abnf.py | 3 ++- websocket/_app.py | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/websocket/_abnf.py b/websocket/_abnf.py index 9d86c5d..7cfabb4 100644 --- a/websocket/_abnf.py +++ b/websocket/_abnf.py @@ -121,7 +121,8 @@ class ABNF(object): raise WebSocketProtocolException("Invalid close frame.") if l > 2 and not validate_utf8(self.data[2:]): raise WebSocketProtocolException("Invalid close frame.") - code = 256*six.byte2int(self.data[0]) + six.byte2int(self.data[1]) + print(self.data) + code = 256*six.byte2int(self.data[0:1]) + six.byte2int(self.data[1:2]) if not self._is_valid_close_status(code): raise WebSocketProtocolException("Invalid close opcode.") diff --git a/websocket/_app.py b/websocket/_app.py index 138fbbe..14bd8a8 100644 --- a/websocket/_app.py +++ b/websocket/_app.py @@ -178,8 +178,9 @@ class WebSocketApp(object): if six.PY3 and frame.opcode == ABNF.OPCODE_TEXT: data = data.decode("utf-8") self._callback(self.on_message, data) - except Exception as e: - self._callback(self.on_error, e) + # except Exception as e: + # print(e) + # self._callback(self.on_error, e) finally: if thread: event.set() @@ -199,7 +200,7 @@ class WebSocketApp(object): return [] if data and len(data) >=2: - code = 256*six.byte2int(data[0]) + six.byte2int(data[1]) + code = 256*six.byte2int(data[0:1]) + six.byte2int(data[1:2]) reason = data[2:].decode('utf-8') return [code,reason]