Mercurial > libervia-backend

changeset 1261:93bce9e4c9c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
plugin XEP-0060: listNodes should not use SatPubSubClient.getDiscoItems but self.host.getDiscoItems, cf. revs 1217 (318eab3f93f8) and 1259 (633fcd13a7dc)
author souliane <souliane@mailoo.org>
date Mon, 24 Nov 2014 17:20:51 +0100
parents c8cf61c6d238
children f8a8434dbac7 9141bde7ff31
files src/plugins/plugin_xep_0060.py
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0060.py	Fri Nov 21 16:36:24 2014 +0100
+++ b/src/plugins/plugin_xep_0060.py	Mon Nov 24 17:20:51 2014 +0100
@@ -129,7 +129,7 @@
         @return: Deferred list[str]
         """
         session_id = profile + '@found@' + service.userhost()
-        d = self.getDiscoItems(service, nodeIdentifier, profile_key=profile)
+        d = self.host.getDiscoItems(service, nodeIdentifier, profile_key=profile)
         d.addCallback(lambda result: [item.getAttribute('node') for item in result.toElement().children if item.hasAttribute('node')])
         return self._getDeferredNodeCache(session_id, d, profile)
 
@@ -231,10 +231,6 @@
         profile, client = self.__getClientNProfile(profile_key, 'retrieve subscriptions')
         return client.subscriptions(service, nodeIdentifier)
 
-    def getDiscoItems(self, service, nodeIdentifier='', profile_key=C.PROF_KEY_NONE):
-        profile, client = self.__getClientNProfile(profile_key, 'disco items')
-        return client.getDiscoItems(None, service, nodeIdentifier)
-
 
 class SatPubSubClient(pubsub.PubSubClient):
     implements(disco.IDisco)