summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-12-30 20:51:02 -0500
committerLance Stout <lancestout@gmail.com>2011-12-30 20:51:02 -0500
commita11e6c0b773169dd395f7456bba5b1b8dd5971f4 (patch)
tree11dc7e079ec80de4270407c8db71874aa38e6861
parent1bb0b3886800ffcb442626b85b1af1ddb4eab0f6 (diff)
downloadslixmpp-a11e6c0b773169dd395f7456bba5b1b8dd5971f4.tar.gz
slixmpp-a11e6c0b773169dd395f7456bba5b1b8dd5971f4.tar.bz2
slixmpp-a11e6c0b773169dd395f7456bba5b1b8dd5971f4.tar.xz
slixmpp-a11e6c0b773169dd395f7456bba5b1b8dd5971f4.zip
Be more lenient on required arguments to disco node handlers.
-rw-r--r--sleekxmpp/plugins/xep_0030/disco.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py
index d99a7cad..58d5b7f3 100644
--- a/sleekxmpp/plugins/xep_0030/disco.py
+++ b/sleekxmpp/plugins/xep_0030/disco.py
@@ -575,7 +575,7 @@ class xep_0030(base_plugin):
"""
self._run_node_handler('del_features', jid, node, None, kwargs)
- def _run_node_handler(self, htype, jid, node, ifrom, data={}):
+ def _run_node_handler(self, htype, jid, node=None, ifrom=None, data={}):
"""
Execute the most specific node handler for the given
JID/node combination.
@@ -586,7 +586,7 @@ class xep_0030(base_plugin):
node -- The node requested.
data -- Optional, custom data to pass to the handler.
"""
- if jid is None:
+ if jid in (None, ''):
if self.xmpp.is_component:
jid = self.xmpp.boundjid.full
else: