diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-13 09:27:47 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-13 09:27:47 -0700 |
| commit | f89df6e70cee5840dbdbf41e68ae7d2384814373 (patch) | |
| tree | dff0d3315c117ecba12fdc2837dd3ed6fad01b86 /sleekxmpp | |
| parent | 250d28e870b63576e09dd1288b05394808518369 (diff) | |
| parent | 0e36a0135407ea9a274517c7cfd5fe32eda0491f (diff) | |
| download | slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.gz slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.bz2 slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.xz slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/plugins/xep_0030/static.py | 5 | ||||
| -rw-r--r-- | sleekxmpp/version.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 7 |
3 files changed, 6 insertions, 10 deletions
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) 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) 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, |