Fix requesting pubsub node configuration, and add tests.
- <default /> doesn't have a type attribute in the XEP - <configure /> isn't used anymore for requesting default configuration
This commit is contained in:
		| @@ -206,11 +206,7 @@ class xep_0060(base_plugin): | ||||
|                         be executed when a reply stanza is received. | ||||
|         """ | ||||
|         iq = self.xmpp.Iq(sto=jid, sfrom=ifrom, stype='get') | ||||
|  | ||||
|         if node is None: | ||||
|             iq['pubsub_owner']['default'] | ||||
|         else: | ||||
|             iq['pubsub_owner']['configure']['node'] = node | ||||
|         iq['pubsub_owner']['default']['node'] = node | ||||
|         return iq.send(block=block, callback=callback, timeout=timeout) | ||||
|  | ||||
|     def get_node_subscriptions(self, jid, node, ifrom=None, block=True, | ||||
|   | ||||
| @@ -22,18 +22,13 @@ class DefaultConfig(ElementBase): | ||||
|     namespace = 'http://jabber.org/protocol/pubsub#owner' | ||||
|     name = 'default' | ||||
|     plugin_attrib = 'default' | ||||
|     interfaces = set(('node', 'type', 'config')) | ||||
|     interfaces = set(('node', 'config')) | ||||
|     plugin_attrib_map = {} | ||||
|     plugin_tag_map = {} | ||||
|  | ||||
|     def __init__(self, *args, **kwargs): | ||||
|         ElementBase.__init__(self, *args, **kwargs) | ||||
|  | ||||
|     def getType(self): | ||||
|         t = self._getAttr('type') | ||||
|         if not t: t = 'leaf' | ||||
|         return t | ||||
|  | ||||
|     def getConfig(self): | ||||
|         return self['form'] | ||||
|  | ||||
| @@ -71,7 +66,7 @@ class OwnerConfigure(Configure): | ||||
|     interfaces = set(('node', 'config')) | ||||
|     plugin_attrib_map = {} | ||||
|     plugin_tag_map = {} | ||||
|      | ||||
|  | ||||
|     def getConfig(self): | ||||
|         return self['form'] | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Lance Stout
					Lance Stout