Mercurial > libervia-backend

diff sat/plugins/plugin_xep_0280.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 114cdde9ff96
children 9d0df638c8b4
line wrap: on
line diff
--- a/sat/plugins/plugin_xep_0280.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat/plugins/plugin_xep_0280.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 managing xep-0280
@@ -26,7 +26,7 @@
 from twisted.words.protocols.jabber.error import StanzaError
 from twisted.internet import defer
 from wokkel import disco, iwokkel
-from zope.interface import implements
+from zope.interface import implementer
 
 try:
     from twisted.words.protocols.xmlstream import XMPPHandler
@@ -36,18 +36,18 @@
 
 PARAM_CATEGORY = "Misc"
 PARAM_NAME = "carbon"
-PARAM_LABEL = D_(u"Message carbons")
+PARAM_LABEL = D_("Message carbons")
 NS_CARBONS = "urn:xmpp:carbons:2"
 
 PLUGIN_INFO = {
-    C.PI_NAME: u"XEP-0280 Plugin",
-    C.PI_IMPORT_NAME: u"XEP-0280",
-    C.PI_TYPE: u"XEP",
-    C.PI_PROTOCOLS: [u"XEP-0280"],
+    C.PI_NAME: "XEP-0280 Plugin",
+    C.PI_IMPORT_NAME: "XEP-0280",
+    C.PI_TYPE: "XEP",
+    C.PI_PROTOCOLS: ["XEP-0280"],
     C.PI_DEPENDENCIES: [],
-    C.PI_MAIN: u"XEP_0280",
-    C.PI_HANDLER: u"yes",
-    C.PI_DESCRIPTION: D_(u"""Implementation of Message Carbons"""),
+    C.PI_MAIN: "XEP_0280",
+    C.PI_HANDLER: "yes",
+    C.PI_DESCRIPTION: D_("""Implementation of Message Carbons"""),
 }
 
 
@@ -87,10 +87,10 @@
         (in particular end 2 end encryption plugins)
         @param message_elt(domish.Element): <message> stanza
         """
-        if message_elt.name != u"message":
-            log.error(u"addPrivateElt must be used with <message> stanzas")
+        if message_elt.name != "message":
+            log.error("addPrivateElt must be used with <message> stanzas")
             return
-        message_elt.addElement((NS_CARBONS, u"private"))
+        message_elt.addElement((NS_CARBONS, "private"))
 
     @defer.inlineCallbacks
     def profileConnected(self, client):
@@ -99,22 +99,22 @@
             PARAM_NAME, PARAM_CATEGORY, profile_key=client.profile
         )
         if not activate:
-            log.info(_(u"Not activating message carbons as requested in params"))
+            log.info(_("Not activating message carbons as requested in params"))
             return
         try:
             yield self.host.checkFeatures(client, (NS_CARBONS,))
         except exceptions.FeatureNotFound:
-            log.warning(_(u"server doesn't handle message carbons"))
+            log.warning(_("server doesn't handle message carbons"))
         else:
-            log.info(_(u"message carbons available, enabling it"))
+            log.info(_("message carbons available, enabling it"))
             iq_elt = client.IQ()
             iq_elt.addElement((NS_CARBONS, "enable"))
             try:
                 yield iq_elt.send()
             except StanzaError as e:
-                log.warning(u"Can't activate message carbons: {}".format(e))
+                log.warning("Can't activate message carbons: {}".format(e))
             else:
-                log.info(_(u"message carbons activated"))
+                log.info(_("message carbons activated"))
 
     def messageReceivedTrigger(self, client, message_elt, post_treat):
         """get message and handle it if carbons namespace is present"""
@@ -131,7 +131,7 @@
 
         if message_elt["from"] != client.jid.userhost():
             log.warning(
-                u"The message carbon received is not from our server, hack attempt?\n{xml}".format(
+                "The message carbon received is not from our server, hack attempt?\n{xml}".format(
                     xml=message_elt.toXml()
                 )
             )
@@ -147,7 +147,7 @@
             message_elt["to"] = cc_message_elt["to"]
         else:
             log.warning(
-                u"invalid message carbons received:\n{xml}".format(
+                "invalid message carbons received:\n{xml}".format(
                     xml=message_elt.toXml()
                 )
             )
@@ -159,8 +159,8 @@
 
         return True
 
+@implementer(iwokkel.IDisco)
 class XEP_0280_handler(XMPPHandler):
-    implements(iwokkel.IDisco)
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_CARBONS)]