From b92ae706e98e94dbc329a099a0a9e10b21a379e7 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 13 Jun 2012 09:13:13 -0700 Subject: Fix loading cached disco identity data. --- sleekxmpp/plugins/xep_0030/static.py | 5 ----- 1 file changed, 5 deletions(-) (limited to 'sleekxmpp') diff --git a/sleekxmpp/plugins/xep_0030/static.py b/sleekxmpp/plugins/xep_0030/static.py index 7306461a..8dd412d4 100644 --- a/sleekxmpp/plugins/xep_0030/static.py +++ b/sleekxmpp/plugins/xep_0030/static.py @@ -182,11 +182,6 @@ class StaticDisco(object): data = {'local': data.get('local', False), 'cached': data.get('cached', True)} - if node in (None, ''): - info = self.caps.get_caps(jid) - if info and identity in info['identities']: - return True - try: info = self.disco.get_info(jid=jid, node=node, ifrom=ifrom, **data) -- cgit v1.2.3 From c39ad7dfbb862d22994329963df8c4729c083305 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 13 Jun 2012 09:13:33 -0700 Subject: Prevent duplicate certificate expiration timers. --- sleekxmpp/xmlstream/xmlstream.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sleekxmpp') diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 6dfd5498..c0d02e9b 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -317,7 +317,7 @@ class XMLStream(object): self.dns_service = None self.add_event_handler('connected', self._handle_connected) - self.add_event_handler('disconnected', self._end_keepalive) + self.add_event_handler('disconnected', self._remove_schedules) self.add_event_handler('session_start', self._start_keepalive) self.add_event_handler('session_start', self._cert_expiration) @@ -878,9 +878,10 @@ class XMLStream(object): kwargs = {'now': True}, repeat=True) - def _end_keepalive(self, event): - """Stop sending whitespace keepalives""" + def _remove_schedules(self, event): + """Remove whitespace keepalive and certificate expiration schedules.""" self.scheduler.remove('Whitespace Keepalive') + self.scheduler.remove('Certificate Expiration') def start_stream_handler(self, xml): """Perform any initialization actions, such as handshakes, -- cgit v1.2.3 From 0e36a0135407ea9a274517c7cfd5fe32eda0491f Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 13 Jun 2012 09:17:08 -0700 Subject: Bump version to 1.1.4 --- sleekxmpp/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sleekxmpp') diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py index 37c2875e..ec793dd8 100644 --- a/sleekxmpp/version.py +++ b/sleekxmpp/version.py @@ -9,5 +9,5 @@ # We don't want to have to import the entire library # just to get the version info for setup.py -__version__ = '1.1.3' -__version_info__ = (1, 1, 3, '', 0) +__version__ = '1.1.4' +__version_info__ = (1, 1, 4, '', 0) -- cgit v1.2.3