diff options
author | Robin Gloster <robin@loc-com.de> | 2014-08-18 00:52:24 +0200 |
---|---|---|
committer | Robin Gloster <robin@loc-com.de> | 2014-08-18 00:55:10 +0200 |
commit | 4144d60017e200d97bcfe0286daee06d4641a9e0 (patch) | |
tree | fb9c0349f91d289b05107e7dad07c78f5be2c691 /sleekxmpp/plugins/xep_0030/disco.py | |
parent | a5c03b763a6545a214f4f391f7c07582c22150b2 (diff) | |
download | slixmpp-4144d60017e200d97bcfe0286daee06d4641a9e0.tar.gz slixmpp-4144d60017e200d97bcfe0286daee06d4641a9e0.tar.bz2 slixmpp-4144d60017e200d97bcfe0286daee06d4641a9e0.tar.xz slixmpp-4144d60017e200d97bcfe0286daee06d4641a9e0.zip |
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, 6 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py index 8a397923..721f73f6 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={}): + def _run_node_handler(self, htype, jid, node=None, ifrom=None, data=None): """ Execute the most specific node handler for the given JID/node combination. @@ -615,6 +615,9 @@ 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): |