summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-01-04 18:38:21 -0500
committerLance Stout <lancestout@gmail.com>2011-01-04 18:38:21 -0500
commit4b145958fae50c5e2a13a59238364a479c54bd9e (patch)
tree8c4eccd00a33de40f39af3091af26c9b0e3da2bd /sleekxmpp/plugins
parente08b0054b2e07bf3ee73bc974135baf7e6f3f819 (diff)
downloadslixmpp-4b145958fae50c5e2a13a59238364a479c54bd9e.tar.gz
slixmpp-4b145958fae50c5e2a13a59238364a479c54bd9e.tar.bz2
slixmpp-4b145958fae50c5e2a13a59238364a479c54bd9e.tar.xz
slixmpp-4b145958fae50c5e2a13a59238364a479c54bd9e.zip
Clarify docs for disco.get_info.
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0030/disco.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py
index 2e993e28..b47cd4bb 100644
--- a/sleekxmpp/plugins/xep_0030/disco.py
+++ b/sleekxmpp/plugins/xep_0030/disco.py
@@ -240,7 +240,8 @@ class xep_0030(base_plugin):
ifrom -- Specifiy the sender's JID.
block -- If true, block and wait for the stanzas' reply.
timeout -- The time in seconds to block while waiting for
- a reply. If None, then wait indefinitely.
+ a reply. If None, then wait indefinitely. The
+ timeout value is only used when block=True.
callback -- Optional callback to execute when a reply is
received instead of blocking and waiting for
the reply.