Mercurial > libervia-backend

diff sat/plugins/plugin_xep_0106.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 28c969432557
children 9d0df638c8b4
line wrap: on
line diff
--- a/sat/plugins/plugin_xep_0106.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat/plugins/plugin_xep_0106.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 Explicit Message Encryption
@@ -21,24 +21,24 @@
 from sat.core.constants import Const as C
 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"JID Escaping",
-    C.PI_IMPORT_NAME: u"XEP-0106",
-    C.PI_TYPE: u"XEP",
+    C.PI_NAME: "JID Escaping",
+    C.PI_IMPORT_NAME: "XEP-0106",
+    C.PI_TYPE: "XEP",
     C.PI_MODES: C.PLUG_MODE_BOTH,
-    C.PI_PROTOCOLS: [u"XEP-0106"],
+    C.PI_PROTOCOLS: ["XEP-0106"],
     C.PI_DEPENDENCIES: [],
-    C.PI_MAIN: u"XEP_0106",
-    C.PI_HANDLER: u"yes",
-    C.PI_DESCRIPTION: _(u"""(Un)escape JID to use disallowed chars in local parts"""),
+    C.PI_MAIN: "XEP_0106",
+    C.PI_HANDLER: "yes",
+    C.PI_DESCRIPTION: _("""(Un)escape JID to use disallowed chars in local parts"""),
 }
 
-NS_JID_ESCAPING = ur"jid\20escaping"
+NS_JID_ESCAPING = r"jid\20escaping"
 ESCAPE_MAP = {
     ' ': r'\20',
     '"': r'\22',
@@ -56,7 +56,7 @@
 class XEP_0106(object):
 
     def __init__(self, host):
-        self.reverse_map = {v:k for k,v in ESCAPE_MAP.iteritems()}
+        self.reverse_map = {v:k for k,v in ESCAPE_MAP.items()}
 
     def getHandler(self, client):
         return XEP_0106_handler()
@@ -69,14 +69,14 @@
         @raise ValueError: text can't be escaped
         """
         if not text or text[0] == ' ' or text[-1] == ' ':
-            raise ValueError(u"text must not be empty, or start or end with a whitespace")
+            raise ValueError("text must not be empty, or start or end with a whitespace")
         escaped = []
         for c in text:
             if c in ESCAPE_MAP:
                 escaped.append(ESCAPE_MAP[c])
             else:
                 escaped.append(c)
-        return u''.join(escaped)
+        return ''.join(escaped)
 
     def unescape(self, escaped):
         """Unescape text
@@ -86,8 +86,8 @@
         @raise ValueError: text can't be unescaped
         """
         if not escaped or escaped.startswith(r'\27') or escaped.endswith(r'\27'):
-            raise ValueError(u"escaped value must not be empty, or start or end with a "
-                             u"whitespace")
+            raise ValueError("escaped value must not be empty, or start or end with a "
+                             "whitespace")
         unescaped = []
         idx = 0
         while idx < len(escaped):
@@ -98,11 +98,11 @@
             else:
                 unescaped.append(escaped[idx])
                 idx += 1
-        return u''.join(unescaped)
+        return ''.join(unescaped)
 
 
+@implementer(disco.IDisco)
 class XEP_0106_handler(xmlstream.XMPPHandler):
-    implements(disco.IDisco)
 
     def getDiscoInfo(self, requestor, target, nodeIdentifier=""):
         return [disco.DiscoFeature(NS_JID_ESCAPING)]