libervia-pubsub: sat_pubsub/backend.py comparison

comparison sat_pubsub/backend.py @ 414:ccb2a22ea0fc

Python 3 port: /!\ Python 3.6+ is now needed to use SàT Pubsub /!\ instability may occur and features may not be working anymore, this will improve with time The same procedure as in backend has been applied (check backend commit ab2696e34d29 logs for details). Python minimal version has been updated in setup.py

author	Goffi <goffi@goffi.org>
date	Fri, 16 Aug 2019 12:53:33 +0200
parents	c56a728412f1
children	4179ed660a85

comparison

equal deleted inserted replaced

-:a5edf5e1dd74
+:ccb2a22ea0fc
-#!/usr/bin/python
+#!/usr/bin/env python3
 #-*- coding: utf-8 -*-
 #
 # Copyright (c) 2012-2019 Jérôme Poisson
 # Copyright (c) 2013-2016 Adrien Cossa
 # Copyright (c) 2003-2011 Ralph Meijer
 """
 import copy
 import uuid
-from zope.interface import implements
+from zope.interface import implementer
 from twisted.application import service
 from twisted.python import components, log
 from twisted.internet import defer, reactor
 from twisted.words.protocols.jabber.error import StanzaError
 """
 return container.ItemData(*[elementCopy(item_data.item)]
 + [copy.deepcopy(d) for d in item_data[1:]])
+@implementer(iidavoll.IBackendService)
 class BackendService(service.Service, utility.EventDispatcher):
 """
 Generic publish-subscribe backend service.
 @cvar nodeOptions: Node configuration form as a mapping from the field
 and possible options to choose from.
 @type nodeOptions: C{dict}.
 @cvar defaultConfig: The default node configuration.
 """
-implements(iidavoll.IBackendService)
 nodeOptions = {
 const.OPT_PERSIST_ITEMS:
 {"type": "boolean",
 "label": "Persist items to storage"},
 def __init__(self, storage, config):
 utility.EventDispatcher.__init__(self)
 self.storage = storage
 self._callbackList = []
 self.config = config
-self.admins = config[u'admins_jids_list']
+self.admins = config['admins_jids_list']
 def isAdmin(self, entity_jid):
 """Return True if an entity is an administrator"""
 return entity_jid.userhostJID() in self.admins
 d.addCallback(self._makeMetaData)
 return d
 def _makeMetaData(self, metaData):
 options = []
-for key, value in metaData.iteritems():
+for key, value in metaData.items():
 if key in self.nodeOptions:
 option = {"var": key}
 option.update(self.nodeOptions[key])
 option["value"] = value
 options.append(option)
 @param item_elt (domish.Element): item to parse
 @return (list): list of found categories
 """
 categories = []
 try:
-entry_elt = item_elt.elements(const.NS_ATOM, "entry").next()
+entry_elt = next(item_elt.elements(const.NS_ATOM, "entry"))
 except StopIteration:
 return categories
 for category_elt in entry_elt.elements(const.NS_ATOM, 'category'):
 category = category_elt.getAttribute('term')
 else:
 raise StanzaError('feature-not-implemented', text='unknown write restriction {}'.format(write_restriction))
 # we now remove every field which is not in data schema
 to_remove = set()
-for item_var, item_field in item_form.fields.iteritems():
+for item_var, item_field in item_form.fields.items():
 if item_var not in schema_form.fields:
 to_remove.add(item_field)
 for field in to_remove:
 item_form.removeField(field)
 """Check that publisher can overwrite items
 current publisher must correspond to each item publisher
 """
 def doCheck(item_pub_map):
-for item_publisher in item_pub_map.itervalues():
+for item_publisher in item_pub_map.values():
 if item_publisher.userhost() != publisher.userhost():
 raise error.ItemForbidden()
 d = node.getItemsPublishers(itemIdentifiers)
 d.addCallback(doCheck)
 item.defaultUri = None
 if not item.getAttribute("id"):
 item["id"] = yield node.getNextId()
 new_item = True
 if ret_payload is None:
-ret_pubsub_elt = domish.Element((pubsub.NS_PUBSUB, u'pubsub'))
+ret_pubsub_elt = domish.Element((pubsub.NS_PUBSUB, 'pubsub'))
-ret_publish_elt = ret_pubsub_elt.addElement(u'publish')
+ret_publish_elt = ret_pubsub_elt.addElement('publish')
-ret_publish_elt[u'node'] = node.nodeIdentifier
+ret_publish_elt['node'] = node.nodeIdentifier
 ret_payload = ret_pubsub_elt
 ret_publish_elt = ret_payload.publish
-ret_item_elt = ret_publish_elt.addElement(u'item')
+ret_item_elt = ret_publish_elt.addElement('item')
-ret_item_elt["id"] = item[u"id"]
+ret_item_elt["id"] = item["id"]
 else:
 check_overwrite = True
 new_item = False
 access_model, item_config = self.parseItemConfig(item)
 categories = self.parseCategories(item)
 publishers = set(pub_map.values())
 if len(publishers) != 1:
 # TODO: handle multiple items publishing (from several
 #       publishers)
 raise error.NoPublishing(
-u"consistent_publisher is currently only possible when "
+"consistent_publisher is currently only possible when "
-u"publishing items from a single publisher. Try to "
+"publishing items from a single publisher. Try to "
-u"publish one item at a time")
+"publish one item at a time")
 # we replace requestor and new payload's publisher by original
 # item publisher to keep publisher consistent
 requestor = publishers.pop()
 for item in items:
 item['publisher'] = requestor.full()
 set())
 subs.add(subscription)
 notifications = [(subscriber, subscriptions_, items_data)
 for subscriber, subscriptions_
-in subsBySubscriber.iteritems()]
+in subsBySubscriber.items()]
 return notifications
 def rootNotFound(failure):
 failure.trap(error.NodeNotFound)
 if requestor_bare in affiliations and affiliations[requestor_bare] != 'owner':
 # FIXME: it may be interesting to allow the owner to ask for ownership removal
 #        if at least one other entity is owner for this node
 raise error.Forbidden("You can't change your own affiliation")
-to_delete = [jid_ for jid_, affiliation in affiliations.iteritems() if affiliation == 'none']
+to_delete = [jid_ for jid_, affiliation in affiliations.items() if affiliation == 'none']
 for jid_ in to_delete:
 del affiliations[jid_]
 if to_delete:
 d = node.deleteAffiliations(to_delete)
 # FIXME: for node, access should be renamed owner-roster, not publisher
 yield self.checkRosterGroups(node, requestor)
 elif access_model == const.VAL_AMODEL_WHITELIST:
 yield self.checkNodeAffiliations(node, requestor)
 else:
-raise Exception(u"Unknown access_model")
+raise Exception("Unknown access_model")
 defer.returnValue((affiliation, owner, roster, access_model))
 @defer.inlineCallbacks
 def getItemsIds(self, nodeIdentifier, requestor, authorized_groups, unrestricted, maxItems=None, ext_data=None, pep=False, recipient=None):
 We check that requestor is publisher of all the items he wants to retract
 and raise error.Forbidden if it is not the case
 """
 # TODO: the behaviour should be configurable (per node ?)
 if (any((requestor.userhostJID() != publisher.userhostJID()
-for publisher in publishers_map.itervalues()))
+for publisher in publishers_map.values()))
 and not self.isAdmin(requestor)
 ):
 raise error.Forbidden()
 if affiliation in ['owner', 'publisher']:
 "subscribe",
 ]
 discoIdentity = disco.DiscoIdentity('pubsub',
 'service',
-u'Salut à Toi pubsub service')
+'Salut à Toi pubsub service')
 pubsubService = None
 _errorMap = {
 error.NodeNotFound: ('item-not-found', None, None),
 subscribers,
 redirectURI))
 return d
 def _mapErrors(self, failure):
-e = failure.trap(*self._errorMap.keys())
+e = failure.trap(*list(self._errorMap.keys()))
 condition, pubsubCondition, feature = self._errorMap[e]
 msg = failure.value.msg
 if pubsubCondition:
 def getConfigurationOptions(self):
 return self.backend.nodeOptions
 def _publish_errb(self, failure, request):
 if failure.type == error.NodeNotFound and self.backend.supportsAutoCreate():
-print "Auto-creating node %s" % (request.nodeIdentifier,)
+print("Auto-creating node %s" % (request.nodeIdentifier,))
 d = self.backend.createNode(request.nodeIdentifier,
 request.sender,
 pep=self._isPep(request),
 recipient=request.recipient)
 d.addCallback(lambda ignore,
 iidavoll.IBackendService,
 iwokkel.IPubSubResource)
+@implementer(iwokkel.IDisco)
 class ExtraDiscoHandler(XMPPHandler):
-implements(iwokkel.IDisco)
 # see comment in twisted/plugins/pubsub.py
 # FIXME: upstream must be fixed so we can use custom (non pubsub#) disco features
 def getDiscoInfo(self, requestor, service, nodeIdentifier=''):
 return [disco.DiscoFeature(pubsub.NS_ORDER_BY)]

Mercurial > libervia-pubsub

comparison sat_pubsub/backend.py @ 414:ccb2a22ea0fc