Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate unnecessary function call

Browse Source
This commit is contained in:
Kovid Goyal 2015-10-28 14:45:48 +05:30
parent 343574245f
commit 875f10287e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/srv/web_socket.py
View File

@ -300,6 +300,7 @@ class WebSocketConnection(HTTPConnection):
except Exception as err: except Exception as err:
self.log.exception('Error in WebSockets upgrade handler:') self.log.exception('Error in WebSockets upgrade handler:')
self.websocket_close(UNEXPECTED_ERROR, 'Unexpected error in handler: %r' % as_unicode(err)) self.websocket_close(UNEXPECTED_ERROR, 'Unexpected error in handler: %r' % as_unicode(err))
self.handle_event = self.ws_duplex
self.set_ws_state() self.set_ws_state()
self.end_send_optimization() self.end_send_optimization()
@ -308,22 +309,22 @@ class WebSocketConnection(HTTPConnection):
if self.ws_close_sent: if self.ws_close_sent:
self.ready = False self.ready = False
else: else:
self.set_state(WRITE, self.ws_duplex) self.wait_for = WRITE
return return
if self.send_buf is not None or self.sending is not None: if self.send_buf is not None or self.sending is not None:
self.set_state(RDWR, self.ws_duplex) self.wait_for = RDWR
else: else:
try: try:
self.sending = self.sendq.get_nowait() self.sending = self.sendq.get_nowait()
except Empty: except Empty:
with self.cf_lock: with self.cf_lock:
if self.control_frames: if self.control_frames:
self.set_state(RDWR, self.ws_duplex) self.wait_for = RDWR
else: else:
self.set_state(READ, self.ws_duplex) self.wait_for = READ
else: else:
self.set_state(RDWR, self.ws_duplex) self.wait_for = RDWR
if self.stop_reading: if self.stop_reading:
if self.wait_for is READ: if self.wait_for is READ: