sat_tmp: sat_tmp/wokkel/pubsub.py comparison

comparison sat_tmp/wokkel/pubsub.py @ 69:0721b6254c9e

python 3 port: - applied 2to3 - replaced zope's implements by @implementer decorator - replaced references to python2 by python3

author	Goffi <goffi@goffi.org>
date	Tue, 13 Aug 2019 18:58:11 +0200
parents	0bb020e9fd47
children	ab556b1c2ca4

comparison

equal deleted inserted replaced

-:042a926cf3b2
+:0721b6254c9e
 This protocol is specified in
 U{XEP-0060<http://xmpp.org/extensions/xep-0060.html>}.
 """
-from zope.interface import implements
+from zope.interface import implementer
 from twisted.internet import defer
 from twisted.python import log
 from twisted.words.protocols.jabber import jid, error
 from twisted.words.xish import domish
 NS_PUBSUB_OWNER = NS_PUBSUB + "#owner"
 NS_PUBSUB_NODE_CONFIG = NS_PUBSUB + "#node_config"
 NS_PUBSUB_META_DATA = NS_PUBSUB + "#meta-data"
 NS_PUBSUB_SUBSCRIBE_OPTIONS = NS_PUBSUB + "#subscribe_options"
-NS_ORDER_BY = u"urn:xmpp:order-by:0"
+NS_ORDER_BY = "urn:xmpp:order-by:0"
 # XPath to match pubsub requests
 PUBSUB_REQUEST = '/iq[@type="get" or @type="set"]/' + \
 'pubsub[@xmlns="' + NS_PUBSUB + '" or ' + \
 '@xmlns="' + NS_PUBSUB_OWNER + '"]'
 @rtype: L{domish.Element}
 """
 element = domish.Element((defaultUri, 'subscription'))
 if self.nodeIdentifier:
 element['node'] = self.nodeIdentifier
-element['jid'] = unicode(self.subscriber)
+element['jid'] = str(self.subscriber)
 element['subscription'] = self.state
 if self.subscriptionIdentifier:
 element['subid'] = self.subscriptionIdentifier
 return element
 domish.Element.__init__(self, (None, 'item'))
 if id is not None:
 self['id'] = id
 if payload is not None:
-if isinstance(payload, basestring):
+if isinstance(payload, str):
 self.addRawXml(payload)
 else:
 self.addChild(payload)
 ('get', NS_PUBSUB_OWNER, 'subscriptions'): 'subscriptionsGet',
 ('set', NS_PUBSUB_OWNER, 'subscriptions'): 'subscriptionsSet',
 }
 # Map request verb to request iq type and subelement name
-_verbRequestMap = dict(((v, k) for k, v in _requestVerbMap.iteritems()))
+_verbRequestMap = dict(((v, k) for k, v in _requestVerbMap.items()))
 # Map request verb to parameter handler names
 _parameters = {
 'publish': ['node', 'items'],
 'subscribe': ['nodeOrEmpty', 'jid', 'optionsWithSubscribe'],
 form = data_form.findForm(verbElement, NS_PUBSUB_NODE_CONFIG)
 if form is not None:
 if form.formType in ('submit', 'cancel'):
 self.options = form
 else:
-raise BadRequest(text=u"Unexpected form type '%s'" % form.formType)
+raise BadRequest(text="Unexpected form type '%s'" % form.formType)
 else:
 raise BadRequest(text="Missing configuration form")
 def _parse_configureOrNone(self, verbElement):
 for element in verbElement.parent.elements():
 if element.uri in (NS_PUBSUB, NS_PUBSUB_OWNER) and element.name == 'configure':
 form = data_form.findForm(element, NS_PUBSUB_NODE_CONFIG)
 if form is not None:
 if form.formType != 'submit':
-raise BadRequest(text=u"Unexpected form type '%s'" %
+raise BadRequest(text="Unexpected form type '%s'" %
 form.formType)
 else:
 form = data_form.Form('submit',
 formNamespace=NS_PUBSUB_NODE_CONFIG)
 self.options = form
 def _render_maxItems(self, verbElement):
 """
 Render maximum items into an items request.
 """
 if self.maxItems:
-verbElement['max_items'] = unicode(self.maxItems)
+verbElement['max_items'] = str(self.maxItems)
 def _parse_subidOrNone(self, verbElement):
 """
 Parse subscription identifier out of a request.
 form = data_form.findForm(verbElement, NS_PUBSUB_SUBSCRIBE_OPTIONS)
 if form is not None:
 if form.formType in ('submit', 'cancel'):
 self.options = form
 else:
-raise BadRequest(text=u"Unexpected form type '%s'" % form.formType)
+raise BadRequest(text="Unexpected form type '%s'" % form.formType)
 else:
 raise BadRequest(text="Missing options form")
 def _render_options(self, verbElement):
 if element.name == 'options' and element.uri == NS_PUBSUB:
 form = data_form.findForm(element,
 NS_PUBSUB_SUBSCRIBE_OPTIONS)
 if form is not None:
 if form.formType != 'submit':
-raise BadRequest(text=u"Unexpected form type '%s'" %
+raise BadRequest(text="Unexpected form type '%s'" %
 form.formType)
 else:
 form = data_form.Form('submit',
 formNamespace=NS_PUBSUB_SUBSCRIBE_OPTIONS)
 self.options = form
 self.affiliations[entity] = affiliation
 def _render_affiliations(self, verbElement):
-for entity, affiliation in self.affiliations.iteritems():
+for entity, affiliation in self.affiliations.items():
 affiliationElement = verbElement.addElement((NS_PUBSUB_OWNER, 'affiliation'))
 affiliationElement['jid'] = entity.full()
 affiliationElement['affiliation'] = affiliation
 A publish-subscribe event that signifies the purging of a node.
 """
+@implementer(IPubSubClient)
 class PubSubClient(XMPPHandler):
 """
 Publish subscribe client protocol.
 """
-implements(IPubSubClient)
 _request_class = PubSubRequest
 def connectionInitialized(self):
 self.xmlstream.addObserver('/message/event[@xmlns="%s"]' %
 d = request.send(self.xmlstream)
 return d
+@implementer(IPubSubService, disco.IDisco)
 class PubSubService(XMPPHandler, IQHandlerMixin):
 """
 Protocol implementation for a XMPP Publish Subscribe Service.
 The word Service here is used as taken from the Publish Subscribe
 @ivar pubSubFeatures: List of supported publish-subscribe features for
 service discovery, as C{str}.
 @type pubSubFeatures: C{list} or C{None}
 """
-implements(IPubSubService, disco.IDisco)
 iqHandlers = {
 '/*': '_onPubSubRequest',
 }
 """
 items = []
 for node in nodes:
 if not node:
 continue
-elif isinstance(node, basestring):
+elif isinstance(node, str):
 items.append(disco.DiscoItem(target, node))
 else:
 _node, name = node
 items.append(disco.DiscoItem(target, _node, name))
 return items
 affiliations = response.addElement('affiliations')
 if request.nodeIdentifier:
 affiliations['node'] = request.nodeIdentifier
-for entity, affiliation in result.iteritems():
+for entity, affiliation in result.items():
 item = affiliations.addElement('affiliation')
 item['jid'] = entity.full()
 item['affiliation'] = affiliation
 return response
 def delete(self, requestor, service, nodeIdentifier):
 raise Unsupported('delete-nodes')
+@implementer(IPubSubResource)
 class PubSubResource(object):
-implements(IPubSubResource)
 features = []
 discoIdentity = disco.DiscoIdentity('pubsub',
 'service',
 'Publish-Subscribe Service')

Mercurial > sat_tmp

comparison sat_tmp/wokkel/pubsub.py @ 69:0721b6254c9e