jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #308 from Mayflower/develop

Browse Source 
Serialize JID to allow json serializing
This commit is contained in:
Lance Stout 2014-08-17 17:20:45 -07:00
commit 09cdbf1b76
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sleekxmpp/xmlstream/stanzabase.py
View File

@ -565,7 +565,10 @@ class ElementBase(object):
values = {} values = {}
values['lang'] = self['lang'] values['lang'] = self['lang']
for interface in self.interfaces: for interface in self.interfaces:
values[interface] = self[interface] if isinstance(self[interface], JID):
values[interface] = self[interface].jid
else:
values[interface] = self[interface]
if interface in self.lang_interfaces: if interface in self.lang_interfaces:
values['%s|*' % interface] = self['%s|*' % interface] values['%s|*' % interface] = self['%s|*' % interface]
for plugin, stanza in self.plugins.items(): for plugin, stanza in self.plugins.items():

13
sleekxmpp/xmlstream/xmlstream.py
View File

@ -938,12 +938,13 @@ class XMLStream(object):
self.whitespace_keepalive_interval = 300 self.whitespace_keepalive_interval = 300
""" """
self.schedule('Whitespace Keepalive', if self.whitespace_keepalive:
self.whitespace_keepalive_interval, self.schedule('Whitespace Keepalive',
self.send_raw, self.whitespace_keepalive_interval,
args=(' ',), self.send_raw,
kwargs={'now': True}, args=(' ',),
repeat=True) kwargs={'now': True},
repeat=True)
def _remove_schedules(self, event): def _remove_schedules(self, event):
"""Remove whitespace keepalive and certificate expiration schedules.""" """Remove whitespace keepalive and certificate expiration schedules."""