# HG changeset patch # User souliane # Date 1416846051 -3600 # Node ID 93bce9e4c9c8b0644ee0915b56f9b9b892bf9649 # Parent c8cf61c6d238a0fb6566160dc97240b6fb6bee1c plugin XEP-0060: listNodes should not use SatPubSubClient.getDiscoItems but self.host.getDiscoItems, cf. revs 1217 (318eab3f93f8) and 1259 (633fcd13a7dc) diff -r c8cf61c6d238 -r 93bce9e4c9c8 src/plugins/plugin_xep_0060.py --- 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)