jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Carry scheduled kwargs all the way

Browse Source
This commit is contained in:
Lance Stout 2013-04-23 11:09:04 -07:00
parent 3c3cd65235
commit 8ec18bdb2c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleekxmpp/xmlstream/scheduler.py
View File

@ -76,7 +76,7 @@ class Task(object):
""" """
if self.qpointer is not None: if self.qpointer is not None:
self.qpointer.put(('schedule', self.callback, self.qpointer.put(('schedule', self.callback,
self.args, self.name)) self.args, self.kwargs, self.name))
else: else:
self.callback(*self.args, **self.kwargs) self.callback(*self.args, **self.kwargs)
self.reset() self.reset()

4
sleekxmpp/xmlstream/xmlstream.py
View File

@ -1648,10 +1648,10 @@ class XMLStream(object):
log.exception(error_msg, handler.name) log.exception(error_msg, handler.name)
orig.exception(e) orig.exception(e)
elif etype == 'schedule': elif etype == 'schedule':
name = args[1] name = args[2]
try: try:
log.debug('Scheduled event: %s: %s', name, args[0]) log.debug('Scheduled event: %s: %s', name, args[0])
handler(*args[0]) handler(*args[0], **args[1])
except Exception as e: except Exception as e:
log.exception('Error processing scheduled task') log.exception('Error processing scheduled task')
self.exception(e) self.exception(e)