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
This commit is contained in:
Goffi 2019-08-13 19:08:41 +02:00
commit fbfe96c505

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
# SAT plugin for parrot mode (experimental)
@ -38,7 +38,7 @@ PLUGIN_INFO = {
C.PI_MAIN: "Exp_Parrot",
C.PI_HANDLER: "no",
C.PI_DESCRIPTION: _(
u"""Implementation of parrot mode (repeat messages between 2 entities)"""
"""Implementation of parrot mode (repeat messages between 2 entities)"""
),
}
@ -60,7 +60,7 @@ class Exp_Parrot(object):
try:
self.host.plugins[C.TEXT_CMDS].registerTextCommands(self)
except KeyError:
log.info(_(u"Text commands not available"))
log.info(_("Text commands not available"))
# def sendMessageTrigger(self, client, mess_data, treatments):
# """ Deactivate other triggers if recipient is in parrot links """
@ -90,7 +90,7 @@ class Exp_Parrot(object):
message = {}
for e in message_elt.elements(C.NS_CLIENT, "body"):
body = unicode(e)
body = str(e)
lang = e.getAttribute("lang") or ""
try:
@ -107,12 +107,12 @@ class Exp_Parrot(object):
return True
else:
src_txt = from_jid.user
message[lang] = u"[{}] {}".format(src_txt, body)
message[lang] = "[{}] {}".format(src_txt, body)
linked = _links[from_jid.userhostJID()]
client.sendMessage(
jid.JID(unicode(linked)), message, None, "auto", no_trigger=True
jid.JID(str(linked)), message, None, "auto", no_trigger=True
)
return True
@ -130,8 +130,8 @@ class Exp_Parrot(object):
_links[source_jid.userhostJID()] = dest_jid
log.info(
u"Parrot mode: %s will be repeated to %s"
% (source_jid.userhost(), unicode(dest_jid))
"Parrot mode: %s will be repeated to %s"
% (source_jid.userhost(), str(dest_jid))
)
def removeParrot(self, client, source_jid):
@ -166,7 +166,7 @@ class Exp_Parrot(object):
txt_cmd.feedBack(
client,
"Parrot mode activated for {}".format(unicode(link_left_jid)),
"Parrot mode activated for {}".format(str(link_left_jid)),
mess_data,
)
@ -183,7 +183,7 @@ class Exp_Parrot(object):
raise jid.InvalidFormat
except jid.InvalidFormat:
txt_cmd.feedBack(
client, u"Can't deactivate Parrot mode for invalid jid", mess_data
client, "Can't deactivate Parrot mode for invalid jid", mess_data
)
return False
@ -194,8 +194,8 @@ class Exp_Parrot(object):
txt_cmd.feedBack(
client,
u"Parrot mode deactivated for {} and {}".format(
unicode(link_left_jid), unicode(link_right_jid)
"Parrot mode deactivated for {} and {}".format(
str(link_left_jid), str(link_right_jid)
),
mess_data,
)