diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-04-23 11:09:04 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-04-23 11:09:04 -0700 |
| commit | 8ec18bdb2c7335356799127941cb52ca6b754a01 (patch) | |
| tree | 8df91ec31754ee491fc2b090a39e8b119b400a76 | |
| parent | 3c3cd65235fc5153acd2d99be0170d6bf0bbb385 (diff) | |
| download | slixmpp-8ec18bdb2c7335356799127941cb52ca6b754a01.tar.gz slixmpp-8ec18bdb2c7335356799127941cb52ca6b754a01.tar.bz2 slixmpp-8ec18bdb2c7335356799127941cb52ca6b754a01.tar.xz slixmpp-8ec18bdb2c7335356799127941cb52ca6b754a01.zip | |
Carry scheduled kwargs all the way
| -rw-r--r-- | sleekxmpp/xmlstream/scheduler.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py index b3e50983..bef8f5e5 100644 --- a/sleekxmpp/xmlstream/scheduler.py +++ b/sleekxmpp/xmlstream/scheduler.py @@ -76,7 +76,7 @@ class Task(object): """ if self.qpointer is not None: self.qpointer.put(('schedule', self.callback, - self.args, self.name)) + self.args, self.kwargs, self.name)) else: self.callback(*self.args, **self.kwargs) self.reset() diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 55074932..478bd9c0 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -1648,10 +1648,10 @@ class XMLStream(object): log.exception(error_msg, handler.name) orig.exception(e) elif etype == 'schedule': - name = args[1] + name = args[2] try: log.debug('Scheduled event: %s: %s', name, args[0]) - handler(*args[0]) + handler(*args[0], **args[1]) except Exception as e: log.exception('Error processing scheduled task') self.exception(e) |