summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gloster <robin@loc-com.de>2014-08-23 14:25:35 +0200
committerRobin Gloster <robin@loc-com.de>2014-08-23 14:25:35 +0200
commit073e85381a86069e931369bb5353cab2a2e3682d (patch)
tree42324f679fb193df1f7e3c6c7c0dd8ef5f7239bf
parentafc939708ff71e168f9204f1eab8823b7dc9f875 (diff)
downloadslixmpp-073e85381a86069e931369bb5353cab2a2e3682d.tar.gz
slixmpp-073e85381a86069e931369bb5353cab2a2e3682d.tar.bz2
slixmpp-073e85381a86069e931369bb5353cab2a2e3682d.tar.xz
slixmpp-073e85381a86069e931369bb5353cab2a2e3682d.zip
fix args, kwargs which were broken with #310. this is essentially the same but working
-rw-r--r--sleekxmpp/plugins/xep_0323/timerreset.py7
-rw-r--r--sleekxmpp/thirdparty/statemachine.py12
2 files changed, 16 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0323/timerreset.py b/sleekxmpp/plugins/xep_0323/timerreset.py
index f36d95e5..398b47c1 100644
--- a/sleekxmpp/plugins/xep_0323/timerreset.py
+++ b/sleekxmpp/plugins/xep_0323/timerreset.py
@@ -23,7 +23,12 @@ class _TimerReset(Thread):
t.cancel() # stop the timer's action if it's still waiting
"""
- def __init__(self, interval, function, *args, **kwargs):
+ def __init__(self, interval, function, args=None, kwargs=None):
+ if not kwargs:
+ kwargs = {}
+ if not args:
+ args = []
+
Thread.__init__(self)
self.interval = interval
self.function = function
diff --git a/sleekxmpp/thirdparty/statemachine.py b/sleekxmpp/thirdparty/statemachine.py
index 9f6906bf..6c504dce 100644
--- a/sleekxmpp/thirdparty/statemachine.py
+++ b/sleekxmpp/thirdparty/statemachine.py
@@ -34,7 +34,7 @@ class StateMachine(object):
self.lock.release()
- def transition(self, from_state, to_state, wait=0.0, func=None, *args, **kwargs):
+ def transition(self, from_state, to_state, wait=0.0, func=None, args=None, kwargs=None):
'''
Transition from the given `from_state` to the given `to_state`.
This method will return `True` if the state machine is now in `to_state`. It
@@ -65,15 +65,23 @@ class StateMachine(object):
values for `args` and `kwargs` are provided, they are expanded and passed like so:
`func( *args, **kwargs )`.
'''
+ if not args:
+ args = []
+ if not kwargs:
+ kwargs = {}
return self.transition_any((from_state,), to_state, wait=wait,
func=func, args=args, kwargs=kwargs)
- def transition_any(self, from_states, to_state, wait=0.0, func=None, *args, **kwargs):
+ def transition_any(self, from_states, to_state, wait=0.0, func=None, args=None, kwargs=None):
'''
Transition from any of the given `from_states` to the given `to_state`.
'''
+ if not args:
+ args = []
+ if not kwargs:
+ kwargs = {}
if not isinstance(from_states, (tuple, list, set)):
raise ValueError("from_states should be a list, tuple, or set")