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

fix #126

Browse Source
This commit is contained in:
liris
2014-11-10 09:19:27 +09:00
parent 3a46a197a8
commit 70d0aea753
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -6,6 +6,7 @@ ChangeLog
- Fix not thread-safe of Websocket.close() (#120) - Fix not thread-safe of Websocket.close() (#120)
- Try to get proxy info from environment if not explicitly provided (#124) - Try to get proxy info from environment if not explicitly provided (#124)
- support proxy basic authenticaiton. (#125) - support proxy basic authenticaiton. (#125)
- Fix NoneType exception at WebsocketApp.send (#126)
- 0.21.0 - 0.21.0

3
websocket/_app.py
View File

@@ -94,7 +94,7 @@ class WebSocketApp(object):
opcode: operation code of data. default is OPCODE_TEXT. opcode: operation code of data. default is OPCODE_TEXT.
""" """
if self.sock.send(data, opcode) == 0: if not self.sock or self.sock.send(data, opcode) == 0:
raise WebSocketConnectionClosedException() raise WebSocketConnectionClosedException()
def close(self): def close(self):
@@ -108,6 +108,7 @@ class WebSocketApp(object):
def _send_ping(self, interval, event): def _send_ping(self, interval, event):
while not event.wait(interval): while not event.wait(interval):
self.last_ping_tm = time.time() self.last_ping_tm = time.time()
if self.sock:
self.sock.ping() self.sock.ping()
def run_forever(self, sockopt=None, sslopt=None, ping_interval=0, ping_timeout=None, def run_forever(self, sockopt=None, sslopt=None, ping_interval=0, ping_timeout=None,