summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2009-06-16 11:59:55 +0000
committerNathan Fritz <fritzy@netflint.net>2009-06-16 11:59:55 +0000
commita9262c4e0a4c23f0ef596feda968dfa25c04b3d2 (patch)
tree59156b0b5117b032e8f07157f6faa739d1a471f5 /sleekxmpp/xmlstream/xmlstream.py
parent5fbf0f84d7ddc90f7bb036617ec55e18e9067f5f (diff)
downloadslixmpp-a9262c4e0a4c23f0ef596feda968dfa25c04b3d2.tar.gz
slixmpp-a9262c4e0a4c23f0ef596feda968dfa25c04b3d2.tar.bz2
slixmpp-a9262c4e0a4c23f0ef596feda968dfa25c04b3d2.tar.xz
slixmpp-a9262c4e0a4c23f0ef596feda968dfa25c04b3d2.zip
* bugfixes
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index ad2c5a1c..e5d5f583 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -194,8 +194,11 @@ class XMLStream(object):
except KeyboardInterrupt:
logging.debug("Keyboard Escape Detected")
self.state.set('processing', False)
+ self.state.set('reconnect', False)
self.disconnect()
raise
+ except CloseStream:
+ break
except:
self.state.set('processing', False)
traceback.print_exc()
@@ -263,7 +266,7 @@ class XMLStream(object):
except socket.error,(errno,strerror):
logging.warning("Error while disconnecting. Socket Error #%s: %s" % (errno, strerror))
if self.state['processing']:
- raise
+ raise CloseStream
def reconnect(self):
self.state.set('tls',False)