diff options
| author | Florent Le Coz <louiz@louiz.org> | 2014-07-23 17:01:17 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-07-23 17:01:17 +0200 |
| commit | 74117453b5c3c2be51206a2b34a3ea2e1818f9d4 (patch) | |
| tree | 5f9df56ea9f3509c22607779d6001505df57a4d4 /slixmpp/features | |
| parent | 5611b30022fbe6c2b91ffb145d604f3c07ff6898 (diff) | |
| download | slixmpp-74117453b5c3c2be51206a2b34a3ea2e1818f9d4.tar.gz slixmpp-74117453b5c3c2be51206a2b34a3ea2e1818f9d4.tar.bz2 slixmpp-74117453b5c3c2be51206a2b34a3ea2e1818f9d4.tar.xz slixmpp-74117453b5c3c2be51206a2b34a3ea2e1818f9d4.zip | |
Cleanup how events are run, they are always direct by definition now
Diffstat (limited to 'slixmpp/features')
| -rw-r--r-- | slixmpp/features/feature_bind/bind.py | 2 | ||||
| -rw-r--r-- | slixmpp/features/feature_mechanisms/mechanisms.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/slixmpp/features/feature_bind/bind.py b/slixmpp/features/feature_bind/bind.py index e26c3ce6..d41bbc3f 100644 --- a/slixmpp/features/feature_bind/bind.py +++ b/slixmpp/features/feature_bind/bind.py @@ -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') diff --git a/slixmpp/features/feature_mechanisms/mechanisms.py b/slixmpp/features/feature_mechanisms/mechanisms.py index ee7db41e..fe38fbd5 100644 --- a/slixmpp/features/feature_mechanisms/mechanisms.py +++ b/slixmpp/features/feature_mechanisms/mechanisms.py @@ -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 |