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 managing xep-0054
@ -44,24 +44,24 @@ PLUGIN_INFO = {
class Identity(object):
def __init__(self, host):
log.info(_(u"Plugin Identity initialization"))
log.info(_("Plugin Identity initialization"))
self.host = host
self._v = host.plugins[u"XEP-0054"]
self._v = host.plugins["XEP-0054"]
host.bridge.addMethod(
u"identityGet",
u".plugin",
in_sign=u"ss",
out_sign=u"a{ss}",
"identityGet",
".plugin",
in_sign="ss",
out_sign="a{ss}",
method=self._getIdentity,
async=True,
async_=True,
)
host.bridge.addMethod(
u"identitySet",
u".plugin",
in_sign=u"a{ss}s",
out_sign=u"",
"identitySet",
".plugin",
in_sign="a{ss}s",
out_sign="",
method=self._setIdentity,
async=True,
async_=True,
)
def _getIdentity(self, jid_str, profile):
@ -84,30 +84,30 @@ class Identity(object):
# we first check roster
roster_item = yield client.roster.getItem(jid_.userhostJID())
if roster_item is not None and roster_item.name:
id_data[u"nick"] = roster_item.name
id_data["nick"] = roster_item.name
elif jid_.resource and self._v.isRoom(client, jid_):
id_data[u"nick"] = jid_.resource
id_data["nick"] = jid_.resource
else:
#  and finally then vcard
nick = yield self._v.getNick(client, jid_)
if nick:
id_data[u"nick"] = nick
id_data["nick"] = nick
elif jid_.user:
id_data[u"nick"] = jid_.user.capitalize()
id_data["nick"] = jid_.user.capitalize()
else:
id_data[u"nick"] = jid_.userhost()
id_data["nick"] = jid_.userhost()
try:
avatar_path = id_data[u"avatar"] = yield self._v.getAvatar(
avatar_path = id_data["avatar"] = yield self._v.getAvatar(
client, jid_, cache_only=False
)
except exceptions.NotFound:
pass
else:
if avatar_path:
id_data[u"avatar_basename"] = os.path.basename(avatar_path)
id_data["avatar_basename"] = os.path.basename(avatar_path)
else:
del id_data[u"avatar"]
del id_data["avatar"]
defer.returnValue(id_data)
@ -122,7 +122,7 @@ class Identity(object):
- nick: nickname
the vCard will be updated
"""
if id_data.keys() != [u"nick"]:
raise NotImplementedError(u"Only nick can be updated for now")
if u"nick" in id_data:
return self._v.setNick(client, id_data[u"nick"])
if list(id_data.keys()) != ["nick"]:
raise NotImplementedError("Only nick can be updated for now")
if "nick" in id_data:
return self._v.setNick(client, id_data["nick"])