summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorThom Nichols <tmnichols@gmail.com>2010-06-07 13:43:37 -0400
committerThom Nichols <tmnichols@gmail.com>2010-06-07 13:43:37 -0400
commit47f1fb16909d3baaec5822b1dcbca89491d0d18c (patch)
treef60363662ece056558deb7e846d2f5177ac115d3 /sleekxmpp/xmlstream
parent66cf0c20218657622a5d98aee155df1ea37d9a89 (diff)
downloadslixmpp-47f1fb16909d3baaec5822b1dcbca89491d0d18c.tar.gz
slixmpp-47f1fb16909d3baaec5822b1dcbca89491d0d18c.tar.bz2
slixmpp-47f1fb16909d3baaec5822b1dcbca89491d0d18c.tar.xz
slixmpp-47f1fb16909d3baaec5822b1dcbca89491d0d18c.zip
context manager now returns a boolean 'result' as the context variable to indicate whether the transition timed out or if you are actually locked when entering the context body
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/statemachine.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/statemachine.py b/sleekxmpp/xmlstream/statemachine.py
index 51b4aaed..b1ab7574 100644
--- a/sleekxmpp/xmlstream/statemachine.py
+++ b/sleekxmpp/xmlstream/statemachine.py
@@ -182,12 +182,12 @@ class _StateCtx:
if time.time() >= start + self.wait:
logging.debug('StateMachine timeout while waiting for state: %s', self.from_state )
self._timeout = True # to indicate we should not transition
- break
+ return False
self.state_machine.lock.wait(self.wait)
logging.debug('StateMachine entered context in state: %s',
self.state_machine.current_state() )
- return self.state_machine
+ return True
def __exit__(self, exc_type, exc_val, exc_tb):
if exc_val is not None: