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

Merge branch 'hacks' of git@github.com:tomstrummer/SleekXMPP into hacks

Browse Source
This commit is contained in:
Tom Nichols 2010-06-28 11:10:34 -04:00
commit 8bdfa77024
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sleekxmpp/xmlstream/statemachine.py
View File

@ -97,7 +97,7 @@ class StateMachine(object):
logging.debug(' ==== TRANSITION %s -> %s', self.__current_state, to_state) logging.debug(' ==== TRANSITION %s -> %s', self.__current_state, to_state)
self.__current_state = to_state self.__current_state = to_state
self.lock.notifyAll() self.lock.notify_all()
return return_val # some 'true' value returned by func or True if func was None return return_val # some 'true' value returned by func or True if func was None
else: else:
logging.error( "StateMachine bug!! The lock should ensure this doesn't happen!" ) logging.error( "StateMachine bug!! The lock should ensure this doesn't happen!" )
@ -126,13 +126,13 @@ class StateMachine(object):
The other main difference between this method and `transition()` is that the The other main difference between this method and `transition()` is that the
state machine is locked for the duration of the `with` statement (normally, state machine is locked for the duration of the `with` statement. Normally,
after a `transition() occurs, the state machine is immediately unlocked and after a `transition()` occurs, the state machine is immediately unlocked and
available to another thread to call `transition()` again. available to another thread to call `transition()` again.
''' '''
if not from_state in self.__states: if not from_state in self.__states:
raise ValueError( "StateMachine does not contain from_state %s." % state ) raise ValueError( "StateMachine does not contain from_state %s." % from_state )
if not to_state in self.__states: if not to_state in self.__states:
raise ValueError( "StateMachine does not contain to_state %s." % to_state ) raise ValueError( "StateMachine does not contain to_state %s." % to_state )
@ -228,7 +228,7 @@ class _StateCtx:
self.state_machine.current_state(), self.to_state) self.state_machine.current_state(), self.to_state)
self.state_machine._set_state( self.to_state ) self.state_machine._set_state( self.to_state )
self.state_machine.lock.notifyAll() self.state_machine.lock.notify_all()
self.state_machine.lock.release() self.state_machine.lock.release()
return False # re-raise any exception return False # re-raise any exception