summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-14 15:11:24 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2015-06-14 15:11:24 +0100
commit04bff001713fa8ebcd67634048acb15caca3d8e6 (patch)
tree648d995c6cb8a3928a3cb96a27c7b644ec159cc3
parenta2852eb249d443e7aef4281bba5243db8a40c837 (diff)
downloadslixmpp-04bff001713fa8ebcd67634048acb15caca3d8e6.tar.gz
slixmpp-04bff001713fa8ebcd67634048acb15caca3d8e6.tar.bz2
slixmpp-04bff001713fa8ebcd67634048acb15caca3d8e6.tar.xz
slixmpp-04bff001713fa8ebcd67634048acb15caca3d8e6.zip
XEP-0030: return the iq.send() future when sending a disco#info or disco#items.
-rw-r--r--slixmpp/plugins/xep_0030/disco.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/slixmpp/plugins/xep_0030/disco.py b/slixmpp/plugins/xep_0030/disco.py
index cf654189..18e7ccde 100644
--- a/slixmpp/plugins/xep_0030/disco.py
+++ b/slixmpp/plugins/xep_0030/disco.py
@@ -368,9 +368,9 @@ class XEP_0030(BasePlugin):
iq['to'] = jid
iq['type'] = 'get'
iq['disco_info']['node'] = node if node else ''
- iq.send(timeout=kwargs.get('timeout', None),
- callback=kwargs.get('callback', None),
- timeout_callback=kwargs.get('timeout_callback', None))
+ return iq.send(timeout=kwargs.get('timeout', None),
+ callback=kwargs.get('callback', None),
+ timeout_callback=kwargs.get('timeout_callback', None))
def set_info(self, jid=None, node=None, info=None):
"""
@@ -429,9 +429,9 @@ class XEP_0030(BasePlugin):
raise NotImplementedError("XEP 0059 has not yet been fixed")
return self.xmpp['xep_0059'].iterate(iq, 'disco_items')
else:
- iq.send(timeout=kwargs.get('timeout', None),
- callback=kwargs.get('callback', None),
- timeout_callback=kwargs.get('timeout_callback', None))
+ return iq.send(timeout=kwargs.get('timeout', None),
+ callback=kwargs.get('callback', None),
+ timeout_callback=kwargs.get('timeout_callback', None))
def set_items(self, jid=None, node=None, **kwargs):
"""