Mercurial > libervia-backend

diff sat/plugins/plugin_xep_0033.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 378188abe941
children 559a625a236b
line wrap: on
line diff
--- a/sat/plugins/plugin_xep_0033.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat/plugins/plugin_xep_0033.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 Extended Stanza Addressing (xep-0033)
@@ -24,7 +24,7 @@
 log = getLogger(__name__)
 from sat.core import exceptions
 from wokkel import disco, iwokkel
-from zope.interface import implements
+from zope.interface import implementer
 from twisted.words.protocols.jabber.jid import JID
 from twisted.python import failure
 import copy
@@ -97,19 +97,19 @@
                         _("XEP-0033 is being used but the server doesn't support it!")
                     )
                     raise failure.Failure(
-                        exceptions.CancelError(u"Cancelled by XEP-0033")
+                        exceptions.CancelError("Cancelled by XEP-0033")
                     )
                 if mess_data["to"] not in entities:
                     expected = _(" or ").join([entity.userhost() for entity in entities])
                     log.warning(
                         _(
-                            u"Stanzas using XEP-0033 should be addressed to %(expected)s, not %(current)s!"
+                            "Stanzas using XEP-0033 should be addressed to %(expected)s, not %(current)s!"
                         )
                         % {"expected": expected, "current": mess_data["to"]}
                     )
                     log.warning(
                         _(
-                            u"TODO: addressing has been fixed by the backend... fix it in the frontend!"
+                            "TODO: addressing has been fixed by the backend... fix it in the frontend!"
                         )
                     )
                     mess_data["to"] = list(entities)[0].userhostJID()
@@ -128,7 +128,7 @@
                 # when the prosody plugin is completed, we can immediately return mess_data from here
                 self.sendAndStoreMessage(mess_data, entries, profile)
                 log.debug("XEP-0033 took over")
-                raise failure.Failure(exceptions.CancelError(u"Cancelled by XEP-0033"))
+                raise failure.Failure(exceptions.CancelError("Cancelled by XEP-0033"))
 
             d = self.host.findFeaturesSet(client, [NS_ADDRESS])
             d.addCallbacks(discoCallback, lambda __: discoCallback(None))
@@ -213,7 +213,7 @@
             return data
 
         try:
-            addresses = message.elements(NS_ADDRESS, "addresses").next()
+            addresses = next(message.elements(NS_ADDRESS, "addresses"))
         except StopIteration:
             pass  # no addresses
         else:
@@ -224,8 +224,8 @@
         return XEP_0033_handler(self, client.profile)
 
 
+@implementer(iwokkel.IDisco)
 class XEP_0033_handler(XMPPHandler):
-    implements(iwokkel.IDisco)
 
     def __init__(self, plugin_parent, profile):
         self.plugin_parent = plugin_parent