diff options
author | liris <liris.pp@gmail.com> | 2014-10-15 15:15:01 +0900 |
---|---|---|
committer | liris <liris.pp@gmail.com> | 2014-10-15 15:15:01 +0900 |
commit | 63c2f5a91ad8bf75a7fe5e69046ae6cb3edee8eb (patch) | |
tree | dce5b69472481d5eda56707e99306924d5e6e833 /websocket/_abnf.py | |
parent | 158663b84f4e98ba19a81845ba0398e3d2a87c2b (diff) | |
download | websocket-client-63c2f5a91ad8bf75a7fe5e69046ae6cb3edee8eb.tar.gz |
refs #117 . change exception type.
Diffstat (limited to 'websocket/_abnf.py')
-rw-r--r-- | websocket/_abnf.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/websocket/_abnf.py b/websocket/_abnf.py index c5ef295..48a230a 100644 --- a/websocket/_abnf.py +++ b/websocket/_abnf.py @@ -105,22 +105,22 @@ class ABNF(object): validate the ABNF frame. """ if self.rsv1 or self.rsv2 or self.rsv3: - raise NotImplementedError("rsv is not implemented, yet") + raise WebSocketProtocolException("rsv is not implemented, yet") if self.opcode == ABNF.OPCODE_PING and not self.fin: - raise WebSocketException("Invalid ping frame.") + raise WebSocketProtocolException("Invalid ping frame.") if self.opcode == ABNF.OPCODE_CLOSE: l = len(self.data) if not l: return if l == 1 or l >= 126: - raise WebSocketException("Invalid close frame.") + raise WebSocketProtocolException("Invalid close frame.") if l > 2 and not validate_utf8(self.data[2:]): - raise WebSocketException("Invalid close frame.") + raise WebSocketProtocolException("Invalid close frame.") code = 256*six.byte2int(self.data[0]) + six.byte2int(self.data[1]) if not self._is_valid_close_status(code): - raise WebSocketException("Invalid close opcode.") + raise WebSocketProtocolException("Invalid close opcode.") def _is_valid_close_status(self, code): return code in VALID_CLOSE_STATUS or (3000 <= code <5000) |