diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-31 13:42:32 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-31 13:42:32 -0700 |
| commit | 4b7ec4a32ac15dfa35b3282793a8317cfd32837b (patch) | |
| tree | 626c0287a09b81ed5415de95f9adeb24ad42293a /sleekxmpp/plugins | |
| parent | a00eee1bbee83b2435b09be6c4175c3649fa797b (diff) | |
| parent | 2229ad8d8e51b73a7900b118dfab5d7b449f17ce (diff) | |
| download | slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.gz slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.bz2 slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.tar.xz slixmpp-4b7ec4a32ac15dfa35b3282793a8317cfd32837b.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins')
| -rw-r--r-- | sleekxmpp/plugins/xep_0030/disco.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py index 278b4a34..8a397923 100644 --- a/sleekxmpp/plugins/xep_0030/disco.py +++ b/sleekxmpp/plugins/xep_0030/disco.py @@ -324,6 +324,8 @@ class XEP_0030(BasePlugin): callback -- Optional callback to execute when a reply is received instead of blocking and waiting for the reply. + timeout_callback -- Optional callback to execute when no result + has been received in timeout seconds. """ if local is None: if jid is not None and not isinstance(jid, JID): @@ -364,7 +366,8 @@ class XEP_0030(BasePlugin): iq['disco_info']['node'] = node if node else '' return iq.send(timeout=kwargs.get('timeout', None), block=kwargs.get('block', True), - callback=kwargs.get('callback', None)) + callback=kwargs.get('callback', None), + timeout_callback=kwargs.get('timeout_callback', None)) def set_info(self, jid=None, node=None, info=None): """ @@ -405,6 +408,8 @@ class XEP_0030(BasePlugin): iterator -- If True, return a result set iterator using the XEP-0059 plugin, if the plugin is loaded. Otherwise the parameter is ignored. + timeout_callback -- Optional callback to execute when no result + has been received in timeout seconds. """ if local or local is None and jid is None: items = self.api['get_items'](jid, node, @@ -423,7 +428,8 @@ class XEP_0030(BasePlugin): else: return iq.send(timeout=kwargs.get('timeout', None), block=kwargs.get('block', True), - callback=kwargs.get('callback', None)) + callback=kwargs.get('callback', None), + timeout_callback=kwargs.get('timeout_callback', None)) def set_items(self, jid=None, node=None, **kwargs): """ |