Mercurial > libervia-backend

diff sat/plugins/plugin_xep_0359.py @ 3028:ab2696e34d29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Python 3 port: /!\ this is a huge commit /!\ starting from this commit, SàT is needs Python 3.6+ /!\ SàT maybe be instable or some feature may not work anymore, this will improve with time This patch port backend, bridge and frontends to Python 3. Roughly this has been done this way: - 2to3 tools has been applied (with python 3.7) - all references to python2 have been replaced with python3 (notably shebangs) - fixed files not handled by 2to3 (notably the shell script) - several manual fixes - fixed issues reported by Python 3 that where not handled in Python 2 - replaced "async" with "async_" when needed (it's a reserved word from Python 3.7) - replaced zope's "implements" with @implementer decorator - temporary hack to handle data pickled in database, as str or bytes may be returned, to be checked later - fixed hash comparison for password - removed some code which is not needed anymore with Python 3 - deactivated some code which needs to be checked (notably certificate validation) - tested with jp, fixed reported issues until some basic commands worked - ported Primitivus (after porting dependencies like urwid satext) - more manual fixes
author Goffi <goffi@goffi.org>
date Tue, 13 Aug 2019 19:08:41 +0200
parents 003b8b4b56a7
children f0f48b4deb35
line wrap: on
line diff
--- a/sat/plugins/plugin_xep_0359.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat/plugins/plugin_xep_0359.py	Tue Aug 13 19:08:41 2019 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # SAT plugin for Message Archive Management (XEP-0359)
@@ -23,38 +23,38 @@
 from sat.core.i18n import _
 from sat.core.log import getLogger
 from twisted.words.protocols.jabber import xmlstream
-from zope.interface import implements
+from zope.interface import implementer
 from wokkel import disco
 
 log = getLogger(__name__)
 
 
 PLUGIN_INFO = {
-    C.PI_NAME: u"Unique and Stable Stanza IDs",
-    C.PI_IMPORT_NAME: u"XEP-0359",
-    C.PI_TYPE: u"XEP",
-    C.PI_PROTOCOLS: [u"XEP-0359"],
-    C.PI_MAIN: u"XEP_0359",
-    C.PI_HANDLER: u"yes",
-    C.PI_DESCRIPTION: _(u"""Implementation of Unique and Stable Stanza IDs"""),
+    C.PI_NAME: "Unique and Stable Stanza IDs",
+    C.PI_IMPORT_NAME: "XEP-0359",
+    C.PI_TYPE: "XEP",
+    C.PI_PROTOCOLS: ["XEP-0359"],
+    C.PI_MAIN: "XEP_0359",
+    C.PI_HANDLER: "yes",
+    C.PI_DESCRIPTION: _("""Implementation of Unique and Stable Stanza IDs"""),
 }
 
-NS_SID = u"urn:xmpp:sid:0"
+NS_SID = "urn:xmpp:sid:0"
 
 
 class XEP_0359(object):
 
     def __init__(self, host):
-        log.info(_(u"Unique and Stable Stanza IDs plugin initialization"))
+        log.info(_("Unique and Stable Stanza IDs plugin initialization"))
         self.host = host
-        host.registerNamespace(u"stanza_id", NS_SID)
-        host.trigger.add(u"message_parse", self._message_parseTrigger)
+        host.registerNamespace("stanza_id", NS_SID)
+        host.trigger.add("message_parse", self._message_parseTrigger)
 
     def _message_parseTrigger(self, client, message_elt, mess_data):
         """Check if message has a stanza-id"""
         stanza_id = self.getStanzaId(message_elt, client.jid.userhostJID())
         if stanza_id is not None:
-            mess_data[u'extra'][u'stanza_id'] = stanza_id
+            mess_data['extra']['stanza_id'] = stanza_id
         return True
 
     def getStanzaId(self, element, by):
@@ -65,13 +65,13 @@
         @return (unicode, None): stanza-id if found
         """
         stanza_id = None
-        for stanza_elt in element.elements(NS_SID, u"stanza-id"):
-            if stanza_elt.getAttribute(u"by") == by.full():
+        for stanza_elt in element.elements(NS_SID, "stanza-id"):
+            if stanza_elt.getAttribute("by") == by.full():
                 if stanza_id is not None:
                     # we must not have more than one element (§3 #4)
                     raise exceptions.DataError(
-                        u"More than one corresponding stanza-id found!")
-                stanza_id = stanza_elt.getAttribute(u"id")
+                        "More than one corresponding stanza-id found!")
+                stanza_id = stanza_elt.getAttribute("id")
                 # we don't break to be sure that there is no more than one element
                 # with this "by" attribute
 
@@ -84,16 +84,16 @@
         @param stanza_id(unicode): id to use
         @param by(jid.JID, None): jid to use or None to use client.jid
         """
-        sid_elt = element.addElement((NS_SID, u"stanza-id"))
-        sid_elt[u"by"] = client.jid.userhost() if by is None else by.userhost()
-        sid_elt[u"id"] = stanza_id
+        sid_elt = element.addElement((NS_SID, "stanza-id"))
+        sid_elt["by"] = client.jid.userhost() if by is None else by.userhost()
+        sid_elt["id"] = stanza_id
 
     def getHandler(self, client):
         return XEP_0359_handler()
 
 
+@implementer(disco.IDisco)
 class XEP_0359_handler(xmlstream.XMPPHandler):
-    implements(disco.IDisco)
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_SID)]