openstack/deb-python-websocket-client
Code Issues Proposed changes

Merge pull request #233 from JustAMan/master

Browse Source 
Handle more built-in exceptions that are not derived from Exception
This commit is contained in:
liris
2016-02-04 16:23:22 +09:00
parent f482a63b10 1b9bd39492
commit 0065c354c5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
websocket/_app.py
View File

@@ -210,8 +210,11 @@ class WebSocketApp(object):
data = data.decode("utf-8") data = data.decode("utf-8")
self._callback(self.on_data, data, frame.opcode, True) self._callback(self.on_data, data, frame.opcode, True)
self._callback(self.on_message, data) self._callback(self.on_message, data)
except Exception as e: except (Exception, KeyboardInterrupt, SystemExit) as e:
self._callback(self.on_error, e) self._callback(self.on_error, e)
if isinstance(e, SystemExit):
# propagate SystemExit further
raise
finally: finally:
if thread: if thread:
event.set() event.set()