diff options
| author | Florent Le Coz <louiz@louiz.org> | 2014-07-21 20:27:53 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-07-21 20:32:09 +0200 |
| commit | 373505f48351a310f7d7ddf0da92fd604682daf1 (patch) | |
| tree | f9e8acc71e984efde700d65944345f9c7c29bda1 /slixmpp/features | |
| parent | a2cad40f9163f7f14a5607853ff42f458844462e (diff) | |
| download | slixmpp-373505f48351a310f7d7ddf0da92fd604682daf1.tar.gz slixmpp-373505f48351a310f7d7ddf0da92fd604682daf1.tar.bz2 slixmpp-373505f48351a310f7d7ddf0da92fd604682daf1.tar.xz slixmpp-373505f48351a310f7d7ddf0da92fd604682daf1.zip | |
Clean a new bunch of stuf
Diffstat (limited to 'slixmpp/features')
| -rw-r--r-- | slixmpp/features/feature_bind/bind.py | 1 | ||||
| -rw-r--r-- | slixmpp/features/feature_mechanisms/mechanisms.py | 4 | ||||
| -rw-r--r-- | slixmpp/features/feature_session/session.py | 1 | ||||
| -rw-r--r-- | slixmpp/features/feature_starttls/starttls.py | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/slixmpp/features/feature_bind/bind.py b/slixmpp/features/feature_bind/bind.py index f636abf9..e26c3ce6 100644 --- a/slixmpp/features/feature_bind/bind.py +++ b/slixmpp/features/feature_bind/bind.py @@ -64,5 +64,4 @@ class FeatureBind(BasePlugin): if 'session' not in self.features['features']: log.debug("Established Session") self.xmpp.sessionstarted = True - self.xmpp.session_started_event.set() self.xmpp.event('session_start') diff --git a/slixmpp/features/feature_mechanisms/mechanisms.py b/slixmpp/features/feature_mechanisms/mechanisms.py index 3cbb83f2..00dd481c 100644 --- a/slixmpp/features/feature_mechanisms/mechanisms.py +++ b/slixmpp/features/feature_mechanisms/mechanisms.py @@ -196,7 +196,7 @@ class FeatureMechanisms(BasePlugin): self.attempted_mechs.add(self.mech.name) self.xmpp.disconnect() else: - resp.send(now=True) + resp.send() return True @@ -217,7 +217,7 @@ class FeatureMechanisms(BasePlugin): else: if resp.get_value() == '': resp.del_value() - resp.send(now=True) + resp.send() def _handle_success(self, stanza): """SASL authentication succeeded. Restart the stream.""" diff --git a/slixmpp/features/feature_session/session.py b/slixmpp/features/feature_session/session.py index 08f7480f..e57405db 100644 --- a/slixmpp/features/feature_session/session.py +++ b/slixmpp/features/feature_session/session.py @@ -51,5 +51,4 @@ class FeatureSession(BasePlugin): log.debug("Established Session") self.xmpp.sessionstarted = True - self.xmpp.session_started_event.set() self.xmpp.event('session_start') diff --git a/slixmpp/features/feature_starttls/starttls.py b/slixmpp/features/feature_starttls/starttls.py index a05f755b..5aad8ed4 100644 --- a/slixmpp/features/feature_starttls/starttls.py +++ b/slixmpp/features/feature_starttls/starttls.py @@ -55,7 +55,7 @@ class FeatureSTARTTLS(BasePlugin): elif self.xmpp.disable_starttls: return False else: - self.xmpp.send(features['starttls'], now=True) + self.xmpp.send(features['starttls']) return True def _handle_starttls_proceed(self, proceed): |