pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix args, kwargs which were broken with #310. this is essentially the same but working

Browse source
This commit is contained in:
Robin Gloster 2014-08-23 14:25:35 +02:00
parent afc939708f
commit 073e85381a
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sleekxmpp/plugins/xep_0323/timerreset.py
View file

@ -23,7 +23,12 @@ class _TimerReset(Thread):
t.cancel() # stop the timer's action if it's still waiting 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) Thread.__init__(self)
self.interval = interval self.interval = interval
self.function = function self.function = function

12
sleekxmpp/thirdparty/statemachine.py vendored
View file

@ -34,7 +34,7 @@ class StateMachine(object):
self.lock.release() 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`. 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 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: values for `args` and `kwargs` are provided, they are expanded and passed like so:
`func( *args, **kwargs )`. `func( *args, **kwargs )`.
''' '''
if not args:
args = []
if not kwargs:
kwargs = {}
return self.transition_any((from_state,), to_state, wait=wait, return self.transition_any((from_state,), to_state, wait=wait,
func=func, args=args, kwargs=kwargs) 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`. 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)): if not isinstance(from_states, (tuple, list, set)):
raise ValueError("from_states should be a list, tuple, or set") raise ValueError("from_states should be a list, tuple, or set")