From eaa0f832371d1153a2f21b2a0e456932c805b4fb Mon Sep 17 00:00:00 2001 From: souliane Date: Mon, 24 Nov 2014 17:20:51 +0100 Subject: [PATCH] plugin XEP-0060: listNodes should not use SatPubSubClient.getDiscoItems but self.host.getDiscoItems, cf. revs 1217 (318eab3f93f8) and 1259 (633fcd13a7dc) --- src/plugins/plugin_xep_0060.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plugins/plugin_xep_0060.py b/src/plugins/plugin_xep_0060.py index f7dce78d..e7b475c4 100755 --- a/src/plugins/plugin_xep_0060.py +++ b/src/plugins/plugin_xep_0060.py @@ -129,7 +129,7 @@ class XEP_0060(object): @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 @@ class XEP_0060(object): 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)