Merge pull request #308 from Mayflower/develop

Serialize JID to allow json serializing

sleekxmpp/xmlstream/stanzabase.py

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

sleekxmpp/xmlstream/xmlstream.py

@@ -938,6 +938,7 @@ class XMLStream(object):
 
             self.whitespace_keepalive_interval = 300
         """
+        if self.whitespace_keepalive:
             self.schedule('Whitespace Keepalive',
                           self.whitespace_keepalive_interval,
                           self.send_raw,