summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-05-20 13:46:36 -0400
committerLance Stout <lancestout@gmail.com>2011-05-20 13:46:36 -0400
commitd3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a (patch)
tree2630acba573d0365b8f0b93ec698700b0d0cc867 /sleekxmpp
parente3b14bc5a9fde7037b309359be8ff1abf5447735 (diff)
parent6a07e7cbe3e995f44ca3ba75a0ff83616269cf5a (diff)
downloadslixmpp-d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a.tar.gz
slixmpp-d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a.tar.bz2
slixmpp-d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a.tar.xz
slixmpp-d3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a.zip
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/clientxmpp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 34d8008b..0d5c85b0 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -234,7 +234,7 @@ class ClientXMPP(BaseXMPP):
'subscription': subscription,
'groups': groups}}
response = iq.send(block, timeout, callback)
- if response in [False, None]:
+ if response in [False, None] or not isinstance(response, Iq):
return response
return response['type'] == 'result'