merged branch frontends_multi_profiles
This commit is contained in:
commit
6760c927d3
1 changed files with 4611 additions and 4514 deletions
|
|
@ -55,7 +55,7 @@ class XEP_0060(object):
|
|||
OPT_PUBLISH_MODEL = 'pubsub#publish_model'
|
||||
|
||||
def __init__(self, host):
|
||||
log.info(_("PubSub plugin initialization"))
|
||||
log.info(_(u"PubSub plugin initialization"))
|
||||
self.host = host
|
||||
self.managedNodes = []
|
||||
self.clients = {}
|
||||
|
|
@ -202,7 +202,7 @@ class XEP_0060(object):
|
|||
d_dict = {}
|
||||
for publisher, node in data.items():
|
||||
if node not in found_nodes:
|
||||
log.debug("Skip the items retrieval for [{node}]: node doesn't exist".format(node=node))
|
||||
log.debug(u"Skip the items retrieval for [{node}]: node doesn't exist".format(node=node))
|
||||
continue # avoid pubsub "item-not-found" error
|
||||
d_dict[publisher] = self.getItems(service, node, max_items, None, sub_id, rsm, profile)
|
||||
defer.returnValue(d_dict)
|
||||
|
|
@ -248,7 +248,7 @@ class XEP_0060(object):
|
|||
d_list = []
|
||||
for nodeIdentifier in (set(nodeIdentifiers) - set(subscribed_nodes)):
|
||||
if nodeIdentifier not in found_nodes:
|
||||
log.debug("Skip the subscription to [{node}]: node doesn't exist".format(node=nodeIdentifier))
|
||||
log.debug(u"Skip the subscription to [{node}]: node doesn't exist".format(node=nodeIdentifier))
|
||||
continue # avoid sat-pubsub "SubscriptionExists" error
|
||||
d_list.append(client.subscribe(service, nodeIdentifier, sub_jid or client.parent.jid.userhostJID(), options=options))
|
||||
defer.returnValue(d_list)
|
||||
|
|
@ -278,7 +278,7 @@ class SatPubSubClient(rsm.PubSubClient):
|
|||
|
||||
def deleteReceived(self, event):
|
||||
#TODO: manage delete event
|
||||
log.debug(_("Publish node deleted"))
|
||||
log.debug(_(u"Publish node deleted"))
|
||||
|
||||
# def purgeReceived(self, event):
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue