Merge branch 'master' into develop

This commit is contained in:
Lance Stout 2012-06-13 09:27:47 -07:00
commit f89df6e70c
4 changed files with 7 additions and 11 deletions

View file

@ -45,7 +45,7 @@ The latest source code for SleekXMPP may be found on `Github
``develop`` branch.
**Latest Release**
- `1.1.3 <http://github.com/fritzy/SleekXMPP/zipball/1.1.3>`_
- `1.1.4 <http://github.com/fritzy/SleekXMPP/zipball/1.1.4>`_
**Develop Releases**
- `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_

View file

@ -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)

View file

@ -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)

View file

@ -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,