Merge branch 'develop' into stream_features

This commit is contained in:
Lance Stout 2011-05-20 13:46:46 -04:00
commit a269be485f

View file

@ -274,7 +274,7 @@ class ClientXMPP(BaseXMPP):
'subscription': subscription, 'subscription': subscription,
'groups': groups}} 'groups': groups}}
response = iq.send(block, timeout, callback) 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
return response['type'] == 'result' return response['type'] == 'result'