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

...

Browse Source
This commit is contained in:
Kovid Goyal 2015-05-26 07:37:49 +05:30
parent a43fdc9871
commit d6eeddbb79
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/srv/http_request.py
View File

@ -250,7 +250,7 @@ class HTTPRequest(Connection):
@property @property
def state_description(self): def state_description(self):
return 'Request: %s' % force_unicode(self.request_line, 'utf-8') return 'State: %s Request: %s' % (getattr(self.handle_event, '__name__', None), force_unicode(self.request_line, 'utf-8'))
def parse_header_line(self, parser, buf, event): def parse_header_line(self, parser, buf, event):
line = self.readline(buf) line = self.readline(buf)

5
src/calibre/srv/loop.py
View File

@ -115,6 +115,7 @@ class Connection(object):
self.wait_for = READ self.wait_for = READ
self.response_started = False self.response_started = False
self.read_buffer = ReadBuffer() self.read_buffer = ReadBuffer()
self.handle_event = None
if self.ssl_context is not None: if self.ssl_context is not None:
self.ready = False self.ready = False
self.socket = self.ssl_context.wrap_socket(socket, server_side=True, do_handshake_on_connect=False) self.socket = self.ssl_context.wrap_socket(socket, server_side=True, do_handshake_on_connect=False)
@ -144,7 +145,9 @@ class Connection(object):
def set_state(self, wait_for, func, *args, **kwargs): def set_state(self, wait_for, func, *args, **kwargs):
self.wait_for = wait_for self.wait_for = wait_for
if args or kwargs: if args or kwargs:
func = partial(func, *args, **kwargs) pfunc = partial(func, *args, **kwargs)
pfunc.__name__ = func.__name__
func = pfunc
self.handle_event = func self.handle_event = func
def do_ssl_handshake(self, event): def do_ssl_handshake(self, event):