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/plugins | |
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/plugins')
-rw-r--r-- | slixmpp/plugins/xep_0078/legacyauth.py | 1 | ||||
-rw-r--r-- | slixmpp/plugins/xep_0115/caps.py | 2 | ||||
-rw-r--r-- | slixmpp/plugins/xep_0198/stream_management.py | 9 |
3 files changed, 5 insertions, 7 deletions
diff --git a/slixmpp/plugins/xep_0078/legacyauth.py b/slixmpp/plugins/xep_0078/legacyauth.py index d3826e59..8d2ea230 100644 --- a/slixmpp/plugins/xep_0078/legacyauth.py +++ b/slixmpp/plugins/xep_0078/legacyauth.py @@ -141,7 +141,6 @@ class XEP_0078(BasePlugin): log.debug("Established Session") self.xmpp.sessionstarted = True - self.xmpp.session_started_event.set() self.xmpp.event('session_start') return True diff --git a/slixmpp/plugins/xep_0115/caps.py b/slixmpp/plugins/xep_0115/caps.py index 378c6ae0..c548de11 100644 --- a/slixmpp/plugins/xep_0115/caps.py +++ b/slixmpp/plugins/xep_0115/caps.py @@ -305,7 +305,7 @@ class XEP_0115(BasePlugin): self.cache_caps(ver, info) self.assign_verstring(jid, ver) - if self.xmpp.session_started_event.is_set() and self.broadcast: + if self.xmpp.sessionstarted and self.broadcast: if self.xmpp.is_component or preserve: for contact in self.xmpp.roster[jid]: self.xmpp.roster[jid][contact].send_last_presence() diff --git a/slixmpp/plugins/xep_0198/stream_management.py b/slixmpp/plugins/xep_0198/stream_management.py index 64052fc5..acf37cd7 100644 --- a/slixmpp/plugins/xep_0198/stream_management.py +++ b/slixmpp/plugins/xep_0198/stream_management.py @@ -173,7 +173,7 @@ class XEP_0198(BasePlugin): ack = stanza.Ack(self.xmpp) with self.handled_lock: ack['h'] = self.handled - self.xmpp.send_raw(str(ack), now=True) + self.xmpp.send_raw(str(ack)) def request_ack(self, e=None): """Request an ack from the server.""" @@ -199,14 +199,14 @@ class XEP_0198(BasePlugin): self.enabled.set() enable = stanza.Enable(self.xmpp) enable['resume'] = self.allow_resume - enable.send(now=True) + enable.send() self.handled = 0 elif self.sm_id and self.allow_resume: self.enabled.set() resume = stanza.Resume(self.xmpp) resume['h'] = self.handled resume['previd'] = self.sm_id - resume.send(now=True) + resume.send() # Wait for a response before allowing stream feature processing # to continue. The actual result processing will be done in the @@ -239,8 +239,7 @@ class XEP_0198(BasePlugin): self.xmpp.features.add('stream_management') self._handle_ack(stanza) for id, stanza in self.unacked_queue: - self.xmpp.send(stanza, now=True, use_filters=False) - self.xmpp.session_started_event.set() + self.xmpp.send(stanza, use_filters=False) self.xmpp.event('session_resumed', stanza) def _handle_failed(self, stanza): |