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

Cleanup how events are run, they are always direct by definition now

Browse Source
This commit is contained in:
Florent Le Coz
2014-07-23 17:01:17 +02:00
parent 5611b30022
commit 74117453b5
7 changed files with 41 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slixmpp/features/feature_bind/bind.py
View File

@@ -54,7 +54,7 @@ class FeatureBind(BasePlugin):
def _on_bind_response(self, response):
self.xmpp.boundjid = JID(response['bind']['jid'], cache_lock=True)
self.xmpp.bound = True
self.xmpp.event('session_bind', self.xmpp.boundjid, direct=True)
self.xmpp.event('session_bind', self.xmpp.boundjid)
self.xmpp.session_bind_event.set()
self.xmpp.features.add('bind')

8
slixmpp/features/feature_mechanisms/mechanisms.py
View File

@@ -172,8 +172,8 @@ class FeatureMechanisms(BasePlugin):
min_mech=self.min_mech)
except sasl.SASLNoAppropriateMechanism:
log.error("No appropriate login method.")
self.xmpp.event("no_auth", direct=True)
self.xmpp.event("failed_auth", direct=True)
self.xmpp.event("no_auth")
self.xmpp.event("failed_auth")
self.attempted_mechs = set()
return self.xmpp.disconnect()
except StringPrepError:
@@ -232,7 +232,7 @@ class FeatureMechanisms(BasePlugin):
self.attempted_mechs = set()
self.xmpp.authenticated = True
self.xmpp.features.add('mechanisms')
self.xmpp.event('auth_success', stanza, direct=True)
self.xmpp.event('auth_success', stanza)
# Restart the stream
self.xmpp.init_parser()
self.xmpp.send_raw(self.xmpp.stream_header)
@@ -241,6 +241,6 @@ class FeatureMechanisms(BasePlugin):
"""SASL authentication failed. Disconnect and shutdown."""
self.attempted_mechs.add(self.mech.name)
log.info("Authentication failed: %s", stanza['condition'])
self.xmpp.event("failed_auth", stanza, direct=True)
self.xmpp.event("failed_auth", stanza)
self._send_auth()
return True