jyapayne/socketIO-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced *args with args.

Browse source 
*args caused dictionary packets to get stripped of values and
as a result, keys were only left, which is useless.
This commit is contained in:
Joey Payne 2016-01-26 15:11:51 -07:00
commit a5f57a7285
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
socketIO_client/__init__.py
View file

@ -79,7 +79,7 @@ class BaseNamespace(object):
""" """
callback, args = find_callback(args) callback, args = find_callback(args)
if callback: if callback:
callback(*args) callback(args)
def on_error(self, reason, advice): def on_error(self, reason, advice):
'Called after server sends an error; you can override this method' 'Called after server sends an error; you can override this method'
@ -117,7 +117,7 @@ class BaseNamespace(object):
return getattr( return getattr(
self, self,
'on_' + event.replace(' ', '_'), 'on_' + event.replace(' ', '_'),
lambda *args: self.on_event(event, *args)) lambda *args: self.on_event(event, args))
class LoggingNamespace(BaseNamespace): class LoggingNamespace(BaseNamespace):
@ -148,7 +148,7 @@ class LoggingNamespace(BaseNamespace):
arguments.append('callback(*args)') arguments.append('callback(*args)')
self._log(logging.INFO, '%s [event] %s(%s)', self.path, event, self._log(logging.INFO, '%s [event] %s(%s)', self.path, event,
', '.join(arguments)) ', '.join(arguments))
super(LoggingNamespace, self).on_event(event, *args) super(LoggingNamespace, self).on_event(event, args)
def on_error(self, reason, advice): def on_error(self, reason, advice):
self._log(logging.INFO, '%s [error] %s', self.path, advice) self._log(logging.INFO, '%s [error] %s', self.path, advice)
@ -422,26 +422,27 @@ class SocketIO(object):
def _on_message(self, packet, find_event_callback): def _on_message(self, packet, find_event_callback):
code, packet_id, path, data = packet code, packet_id, path, data = packet
args = [data] args = data
self._send_args('message', args, path, packet_id, find_event_callback)
def _send_args(self, event, args, path, packet_id, find_event_callback):
ev_args = [args]
if packet_id: if packet_id:
args.append(self._prepare_to_send_ack(path, packet_id)) ack = self._prepare_to_send_ack(path, packet_id)
find_event_callback('message')(*args) ev_args.append(ack)
find_event_callback(event)(*ev_args)
def _on_json(self, packet, find_event_callback): def _on_json(self, packet, find_event_callback):
code, packet_id, path, data = packet code, packet_id, path, data = packet
args = [json.loads(data)] args = json.loads(data)
if packet_id: self._send_args('message', args, path, packet_id, find_event_callback)
args.append(self._prepare_to_send_ack(path, packet_id))
find_event_callback('message')(*args)
def _on_event(self, packet, find_event_callback): def _on_event(self, packet, find_event_callback):
code, packet_id, path, data = packet code, packet_id, path, data = packet
value_by_name = json.loads(data) value_by_name = json.loads(data)
event = value_by_name['name'] event = value_by_name['name']
args = value_by_name.get('args', []) args = value_by_name.get('args', [])
if packet_id: self._send_args(event, args, path, packet_id, find_event_callback)
args.append(self._prepare_to_send_ack(path, packet_id))
find_event_callback(event)(*args)
def _on_ack(self, packet, find_event_callback): def _on_ack(self, packet, find_event_callback):
code, packet_id, path, data = packet code, packet_id, path, data = packet
@ -452,7 +453,7 @@ class SocketIO(object):
except KeyError: except KeyError:
return return
args = json.loads(data_parts[1]) if len(data_parts) > 1 else [] args = json.loads(data_parts[1]) if len(data_parts) > 1 else []
ack_callback(*args) ack_callback(args)
def _on_error(self, packet, find_event_callback): def _on_error(self, packet, find_event_callback):
code, packet_id, path, data = packet code, packet_id, path, data = packet