summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0030
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-22 20:42:43 -0400
committerLance Stout <lancestout@gmail.com>2011-03-22 20:42:43 -0400
commit4b1fadde4bd87a8763131165701c08a3035005eb (patch)
treef5408e05793dbdad7e4b02427ec67cfece66e432 /sleekxmpp/plugins/xep_0030
parent86a6b40fd81daa7d0e976dbc63f33544060c75d1 (diff)
downloadslixmpp-4b1fadde4bd87a8763131165701c08a3035005eb.tar.gz
slixmpp-4b1fadde4bd87a8763131165701c08a3035005eb.tar.bz2
slixmpp-4b1fadde4bd87a8763131165701c08a3035005eb.tar.xz
slixmpp-4b1fadde4bd87a8763131165701c08a3035005eb.zip
Updated XEP-0128 plugin to work with the new XEP-0030 plugin.
Required fixing a few bugs in StanzaBase related to iterable substanzas.
Diffstat (limited to 'sleekxmpp/plugins/xep_0030')
-rw-r--r--sleekxmpp/plugins/xep_0030/disco.py36
-rw-r--r--sleekxmpp/plugins/xep_0030/static.py3
2 files changed, 26 insertions, 13 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py
index 1c967bd5..83d7a9c0 100644
--- a/sleekxmpp/plugins/xep_0030/disco.py
+++ b/sleekxmpp/plugins/xep_0030/disco.py
@@ -60,10 +60,13 @@ class xep_0030(base_plugin):
disco_items_query -- Received a disco#items Iq query request.
Attributes:
- stanza -- A reference to the module containing the stanza classes
- provided by this plugin.
- static -- Object containing the default set of static node handlers.
- xmpp -- The main SleekXMPP object.
+ stanza -- A reference to the module containing the
+ stanza classes provided by this plugin.
+ static -- Object containing the default set of
+ static node handlers.
+ default_handlers -- A dictionary mapping operations to the default
+ global handler (by default, the static handlers).
+ xmpp -- The main SleekXMPP object.
Methods:
set_node_handler -- Assign a handler to a JID/node combination.
@@ -110,11 +113,10 @@ class xep_0030(base_plugin):
'add_identity', 'del_identity', 'add_feature',
'del_feature', 'add_item', 'del_item',
'del_identities', 'del_features']
+ self.default_handlers = {}
self._handlers = {}
for op in self._disco_ops:
- self._handlers[op] = {'global': getattr(self.static, op),
- 'jid': {},
- 'node': {}}
+ self._add_disco_op(op, getattr(self.static, op))
def post_init(self):
"""Handle cross-plugin dependencies."""
@@ -123,6 +125,12 @@ class xep_0030(base_plugin):
register_stanza_plugin(DiscoItems,
self.xmpp['xep_0059'].stanza.Set)
+ def _add_disco_op(self, op, default_handler):
+ self.default_handlers[op] = default_handler
+ self._handlers[op] = {'global': default_handler,
+ 'jid': {},
+ 'node': {}}
+
def set_node_handler(self, htype, jid=None, node=None, handler=None):
"""
Add a node handler for the given hierarchy level and
@@ -205,26 +213,29 @@ class xep_0030(base_plugin):
"""
self.set_node_handler(htype, jid, node, None)
- def make_static(self, jid=None, node=None, handlers=None):
+ def restore_defaults(self, jid=None, node=None, handlers=None):
"""
- Change all of a node's handlers to the default static
+ Change all or some of a node's handlers to the default
handlers. Useful for manually overriding the contents
of a node that would otherwise be handled by a JID level
or global level dynamic handler.
+ The default is to use the built-in static handlers, but that
+ may be changed by modifying self.default_handlers.
+
Arguments:
jid -- The JID owning the node to modify.
node -- The node to change to using static handlers.
handlers -- Optional list of handlers to change to the
- static version. If provided, only these
+ default version. If provided, only these
handlers will be changed. Otherwise, all
- handlers will use the static version.
+ handlers will use the default version.
"""
if handlers is None:
handlers = self._disco_ops
for op in handlers:
self.del_node_handler(op, jid, node)
- self.set_node_handler(op, jid, node, getattr(self.static, op))
+ self.set_node_handler(op, jid, node, self.default_handlers[op])
def get_info(self, jid=None, node=None, local=False, **kwargs):
"""
@@ -609,3 +620,4 @@ class xep_0030(base_plugin):
# Retain some backwards compatibility
xep_0030.getInfo = xep_0030.get_info
xep_0030.getItems = xep_0030.get_items
+xep_0030.make_static = xep_0030.restore_defaults
diff --git a/sleekxmpp/plugins/xep_0030/static.py b/sleekxmpp/plugins/xep_0030/static.py
index 654a9bd0..7e7f0353 100644
--- a/sleekxmpp/plugins/xep_0030/static.py
+++ b/sleekxmpp/plugins/xep_0030/static.py
@@ -120,7 +120,8 @@ class StaticDisco(object):
"""
Replace the stored items data for a JID/node combination.
- The data parameter is not used.
+ The data parameter may provided:
+ items -- A set of items in tuple format.
"""
items = data.get('items', set())
self.add_node(jid, node)