summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-03-11 16:42:15 -0700
committerLance Stout <lancestout@gmail.com>2013-03-11 16:42:15 -0700
commit8b73c2bcff14fbda4b2549f167047a7ca1187fa8 (patch)
tree374c98cfe83ab1e07a45f8550de25f8b985f8d02
parent5a771dbe2fd491b30e21ee485f4f4e1e67eaf656 (diff)
parentf76f0c37876183447d8892b03e250f6c6b168cb4 (diff)
downloadslixmpp-8b73c2bcff14fbda4b2549f167047a7ca1187fa8.tar.gz
slixmpp-8b73c2bcff14fbda4b2549f167047a7ca1187fa8.tar.bz2
slixmpp-8b73c2bcff14fbda4b2549f167047a7ca1187fa8.tar.xz
slixmpp-8b73c2bcff14fbda4b2549f167047a7ca1187fa8.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
-rw-r--r--sleekxmpp/plugins/xep_0199/ping.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0199/ping.py b/sleekxmpp/plugins/xep_0199/ping.py
index b024880e..3987c19e 100644
--- a/sleekxmpp/plugins/xep_0199/ping.py
+++ b/sleekxmpp/plugins/xep_0199/ping.py
@@ -106,7 +106,7 @@ class XEP_0199(BasePlugin):
def _keepalive(self, event=None):
log.debug("Keepalive ping...")
try:
- rtt = self.ping(self.xmpp.boundjid.host, self.timeout)
+ rtt = self.ping(self.xmpp.boundjid.host, timeout=self.timeout)
except IqTimeout:
log.debug("Did not recieve ping back in time." + \
"Requesting Reconnect.")