diff options
| author | Lance Stout <lancestout@gmail.com> | 2014-08-17 17:20:45 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2014-08-17 17:20:45 -0700 |
| commit | 09cdbf1b76c6bf30e585a910f0f59d533c8dec21 (patch) | |
| tree | d32011f02f648de9ba2d5ea99d5af1daefecbaf9 /sleekxmpp/xmlstream/xmlstream.py | |
| parent | ca306e7cecee4bf7afd9ce44f5f067b305928682 (diff) | |
| parent | 7265682a4d57d88956cb54f98f7a470465bbf417 (diff) | |
| download | slixmpp-09cdbf1b76c6bf30e585a910f0f59d533c8dec21.tar.gz slixmpp-09cdbf1b76c6bf30e585a910f0f59d533c8dec21.tar.bz2 slixmpp-09cdbf1b76c6bf30e585a910f0f59d533c8dec21.tar.xz slixmpp-09cdbf1b76c6bf30e585a910f0f59d533c8dec21.zip | |
Merge pull request #308 from Mayflower/develop
Serialize JID to allow json serializing
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index a871238a..01787b5e 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -938,12 +938,13 @@ class XMLStream(object): self.whitespace_keepalive_interval = 300 """ - self.schedule('Whitespace Keepalive', - self.whitespace_keepalive_interval, - self.send_raw, - args=(' ',), - kwargs={'now': True}, - repeat=True) + if self.whitespace_keepalive: + self.schedule('Whitespace Keepalive', + self.whitespace_keepalive_interval, + self.send_raw, + args=(' ',), + kwargs={'now': True}, + repeat=True) def _remove_schedules(self, event): """Remove whitespace keepalive and certificate expiration schedules.""" |