diff options
| author | Lance Stout <lancestout@gmail.com> | 2014-08-18 13:34:15 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2014-08-18 13:34:15 -0700 |
| commit | e5e2fbb16b4d9c11fc676925c6a13943282a3c66 (patch) | |
| tree | 5dc018384ad03253608ff79c9fdbb577b84d2d2f /sleekxmpp/plugins/xep_0030/disco.py | |
| parent | a20582aba4de85f5a193395df2d0ed8c75220bfb (diff) | |
| parent | 3dd379cdf12d885e26f8ec26c54879a95d5f0b84 (diff) | |
| download | slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.gz slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.bz2 slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.tar.xz slixmpp-e5e2fbb16b4d9c11fc676925c6a13943282a3c66.zip | |
Merge pull request #311 from Mayflower/develop
Revert "cleanup semicolons, whitespace and mutable default arguments"
Diffstat (limited to 'sleekxmpp/plugins/xep_0030/disco.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0030/disco.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py index 721f73f6..8a397923 100644 --- a/sleekxmpp/plugins/xep_0030/disco.py +++ b/sleekxmpp/plugins/xep_0030/disco.py @@ -324,7 +324,7 @@ 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 + timeout_callback -- Optional callback to execute when no result has been received in timeout seconds. """ if local is None: @@ -408,7 +408,7 @@ 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 + 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: @@ -604,7 +604,7 @@ class XEP_0030(BasePlugin): """ self.api['del_features'](jid, node, None, kwargs) - def _run_node_handler(self, htype, jid, node=None, ifrom=None, data=None): + def _run_node_handler(self, htype, jid, node=None, ifrom=None, data={}): """ Execute the most specific node handler for the given JID/node combination. @@ -615,9 +615,6 @@ class XEP_0030(BasePlugin): node -- The node requested. data -- Optional, custom data to pass to the handler. """ - if not data: - data = {} - return self.api[htype](jid, node, ifrom, data) def _handle_disco_info(self, iq): |