diff options
| author | mathieui <mathieui@mathieui.net> | 2015-09-23 23:14:26 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2015-09-23 23:15:09 +0200 |
| commit | 4512248901700ce464716b79a2a1108194c91cda (patch) | |
| tree | 93cf7524b52f2a25a5bfac99362202fe478830e3 /docs | |
| parent | e42d651d7ed56375523f91076295fc5f388a8de0 (diff) | |
| parent | 4305eddb4f634803423cd53d193125a63b00769a (diff) | |
| download | slixmpp-sleek-merge.tar.gz slixmpp-sleek-merge.tar.bz2 slixmpp-sleek-merge.tar.xz slixmpp-sleek-merge.zip | |
Merge branch 'develop' of https://github.com/fritzy/SleekXMPP into sleek-mergesleek-merge
Conflicts:
README.rst
examples/IoT_TestDevice.py
examples/disco_browser.py
setup.py
sleekxmpp/jid.py
sleekxmpp/plugins/google/auth/stanza.py
sleekxmpp/plugins/google/gmail/notifications.py
sleekxmpp/plugins/google/nosave/stanza.py
sleekxmpp/plugins/google/settings/settings.py
sleekxmpp/thirdparty/__init__.py
sleekxmpp/thirdparty/socks.py
sleekxmpp/thirdparty/statemachine.py
sleekxmpp/util/__init__.py
sleekxmpp/xmlstream/xmlstream.py
slixmpp/basexmpp.py
slixmpp/plugins/xep_0004/stanza/form.py
slixmpp/plugins/xep_0009/rpc.py
slixmpp/plugins/xep_0050/adhoc.py
slixmpp/plugins/xep_0065/proxy.py
slixmpp/plugins/xep_0084/stanza.py
slixmpp/plugins/xep_0202/time.py
slixmpp/plugins/xep_0323/sensordata.py
slixmpp/plugins/xep_0325/control.py
slixmpp/plugins/xep_0325/stanza/control.py
slixmpp/roster/single.py
slixmpp/stanza/atom.py
slixmpp/stanza/rootstanza.py
slixmpp/test/slixtest.py
slixmpp/util/sasl/mechanisms.py
slixmpp/version.py
slixmpp/xmlstream/stanzabase.py
tests/test_stanza_xep_0323.py
tests/test_stanza_xep_0325.py
tests/test_stream_xep_0323.py
tests/test_stream_xep_0325.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/guide_xep_0030.rst | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/guide_xep_0030.rst b/docs/guide_xep_0030.rst index 674b9eb5..8d98e3bd 100644 --- a/docs/guide_xep_0030.rst +++ b/docs/guide_xep_0030.rst @@ -161,7 +161,7 @@ item itself, and the JID and node that will own the item. In this case, the owning JID and node are provided with the parameters ``ijid`` and ``node``. -Peforming Disco Queries +Performing Disco Queries ----------------------- The methods ``get_info()`` and ``get_items()`` are used to query remote JIDs and their nodes for disco information. Since these methods are wrappers for @@ -172,11 +172,10 @@ the `XEP-0059 <http://xmpp.org/extensions/xep-0059.html>`_ plug-in. .. code-block:: python - info = self['xep_0030'].get_info(jid='foo@example.com', - node='bar', - ifrom='baz@mycomponent.example.com', - block=True, - timeout=30) + info = yield from self['xep_0030'].get_info(jid='foo@example.com', + node='bar', + ifrom='baz@mycomponent.example.com', + timeout=30) items = self['xep_0030'].get_info(jid='foo@example.com', node='bar', |