diff options
author | Robin Gloster <robin@loc-com.de> | 2014-08-23 14:25:35 +0200 |
---|---|---|
committer | Robin Gloster <robin@loc-com.de> | 2014-08-23 14:25:35 +0200 |
commit | 073e85381a86069e931369bb5353cab2a2e3682d (patch) | |
tree | 42324f679fb193df1f7e3c6c7c0dd8ef5f7239bf /sleekxmpp/thirdparty/statemachine.py | |
parent | afc939708ff71e168f9204f1eab8823b7dc9f875 (diff) | |
download | slixmpp-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
Diffstat (limited to 'sleekxmpp/thirdparty/statemachine.py')
-rw-r--r-- | sleekxmpp/thirdparty/statemachine.py | 12 |
1 files changed, 10 insertions, 2 deletions
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") |