Mercurial > libervia-backend

diff sat/plugins/plugin_xep_0297.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 9d0df638c8b4
line wrap: on
line diff
--- a/sat/plugins/plugin_xep_0297.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat/plugins/plugin_xep_0297.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 Stanza Forwarding (XEP-0297)
@@ -30,18 +30,18 @@
     from twisted.words.protocols.xmlstream import XMPPHandler
 except ImportError:
     from wokkel.subprotocols import XMPPHandler
-from zope.interface import implements
+from zope.interface import implementer
 
 from twisted.words.xish import domish
 
 PLUGIN_INFO = {
-    C.PI_NAME: u"Stanza Forwarding",
-    C.PI_IMPORT_NAME: u"XEP-0297",
-    C.PI_TYPE: u"XEP",
-    C.PI_PROTOCOLS: [u"XEP-0297"],
+    C.PI_NAME: "Stanza Forwarding",
+    C.PI_IMPORT_NAME: "XEP-0297",
+    C.PI_TYPE: "XEP",
+    C.PI_PROTOCOLS: ["XEP-0297"],
     C.PI_MAIN: "XEP_0297",
-    C.PI_HANDLER: u"yes",
-    C.PI_DESCRIPTION: D_(u"""Implementation of Stanza Forwarding"""),
+    C.PI_HANDLER: "yes",
+    C.PI_DESCRIPTION: D_("""Implementation of Stanza Forwarding"""),
 }
 
 
@@ -49,7 +49,7 @@
     # FIXME: check this implementation which doesn't seems to be used
 
     def __init__(self, host):
-        log.info(_(u"Stanza Forwarding plugin initialization"))
+        log.info(_("Stanza Forwarding plugin initialization"))
         self.host = host
 
     def getHandler(self, client):
@@ -83,7 +83,7 @@
         # FIXME: this method is not used and doesn't use mess_data which should be used for client.sendMessageData
         #        should it be deprecated? A method constructing the element without sending it seems more natural
         log.warning(
-            u"THIS METHOD IS DEPRECATED"
+            "THIS METHOD IS DEPRECATED"
         )  #  FIXME: we use this warning until we check the method
         msg = domish.Element((None, "message"))
         msg["to"] = to_jid.full()
@@ -104,11 +104,11 @@
         msg.addChild(forwarded_elt)
 
         client = self.host.getClient(profile_key)
-        return client.sendMessageData({u"xml": msg})
+        return client.sendMessageData({"xml": msg})
 
 
+@implementer(iwokkel.IDisco)
 class XEP_0297_handler(XMPPHandler):
-    implements(iwokkel.IDisco)
 
     def __init__(self, plugin_parent, profile):
         self.plugin_parent = plugin_parent