summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-06-02 15:59:10 -0400
committerLance Stout <lancestout@gmail.com>2010-06-02 15:59:10 -0400
commite700a54d11a01c0ed24cddb14ceac0511fbc8372 (patch)
tree124c5fb5b92e9e4addf415105834f6ea449ddc27 /sleekxmpp
parent6469cdb4ca4b94b9154d7efb408aba3a7a7b42e4 (diff)
downloadslixmpp-e700a54d11a01c0ed24cddb14ceac0511fbc8372.tar.gz
slixmpp-e700a54d11a01c0ed24cddb14ceac0511fbc8372.tar.bz2
slixmpp-e700a54d11a01c0ed24cddb14ceac0511fbc8372.tar.xz
slixmpp-e700a54d11a01c0ed24cddb14ceac0511fbc8372.zip
Return result of iq.send() for disco requests. Events are still triggered, but now the caller can determine if there was a timeout.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/plugins/xep_0030.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0030.py b/sleekxmpp/plugins/xep_0030.py
index 9fcc8b17..73f4636f 100644
--- a/sleekxmpp/plugins/xep_0030.py
+++ b/sleekxmpp/plugins/xep_0030.py
@@ -299,7 +299,7 @@ class xep_0030(base.base_plugin):
iq['to'] = jid
iq['from'] = dfrom
iq['disco_info']['node'] = node
- iq.send()
+ return iq.send()
def getItems(self, jid, node='', dfrom=None):
iq = self.xmpp.Iq()
@@ -307,7 +307,7 @@ class xep_0030(base.base_plugin):
iq['to'] = jid
iq['from'] = dfrom
iq['disco_items']['node'] = node
- iq.send()
+ return iq.send()
def add_feature(self, feature, node='main'):
self.add_node(node)