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

@ -38,7 +38,7 @@ class ProfileConnect(base.CommandBase):
def __init__(self, host):
# it's weird to have a command named "connect" with need_connect=False, but it can be handy to be able
# to launch just the session, so some paradoxes don't hurt
super(ProfileConnect, self).__init__(host, 'connect', need_connect=False, help=(u'connect a profile'))
super(ProfileConnect, self).__init__(host, 'connect', need_connect=False, help=('connect a profile'))
def add_parser_options(self):
pass
@ -47,7 +47,7 @@ class ProfileConnect(base.CommandBase):
class ProfileDisconnect(base.CommandBase):
def __init__(self, host):
super(ProfileDisconnect, self).__init__(host, 'disconnect', need_connect=False, help=(u'disconnect a profile'))
super(ProfileDisconnect, self).__init__(host, 'disconnect', need_connect=False, help=('disconnect a profile'))
self.need_loop = True
def add_parser_options(self):
@ -59,32 +59,32 @@ class ProfileDisconnect(base.CommandBase):
class ProfileDefault(base.CommandBase):
def __init__(self, host):
super(ProfileDefault, self).__init__(host, 'default', use_profile=False, help=(u'print default profile'))
super(ProfileDefault, self).__init__(host, 'default', use_profile=False, help=('print default profile'))
def add_parser_options(self):
pass
def start(self):
print self.host.bridge.profileNameGet('@DEFAULT@')
print(self.host.bridge.profileNameGet('@DEFAULT@'))
class ProfileDelete(base.CommandBase):
def __init__(self, host):
super(ProfileDelete, self).__init__(host, 'delete', use_profile=False, help=(u'delete a profile'))
super(ProfileDelete, self).__init__(host, 'delete', use_profile=False, help=('delete a profile'))
def add_parser_options(self):
self.parser.add_argument('profile', type=str, help=PROFILE_HELP)
self.parser.add_argument('-f', '--force', action='store_true', help=_(u'delete profile without confirmation'))
self.parser.add_argument('-f', '--force', action='store_true', help=_('delete profile without confirmation'))
def start(self):
if self.args.profile not in self.host.bridge.profilesListGet():
log.error("Profile %s doesn't exist." % self.args.profile)
self.host.quit(1)
if not self.args.force:
message = u"Are you sure to delete profile [{}] ?".format(self.args.profile)
res = raw_input("{} (y/N)? ".format(message))
message = "Are you sure to delete profile [{}] ?".format(self.args.profile)
res = input("{} (y/N)? ".format(message))
if res not in ("y", "Y"):
self.disp(_(u"Profile deletion cancelled"))
self.disp(_("Profile deletion cancelled"))
self.host.quit(2)
self.host.bridge.asyncDeleteProfile(self.args.profile, callback=lambda __: None)
@ -92,19 +92,19 @@ class ProfileDelete(base.CommandBase):
class ProfileInfo(base.CommandBase):
def __init__(self, host):
super(ProfileInfo, self).__init__(host, 'info', need_connect=False, help=_(u'get information about a profile'))
super(ProfileInfo, self).__init__(host, 'info', need_connect=False, help=_('get information about a profile'))
self.need_loop = True
self.to_show = [(_(u"jid"), "Connection", "JabberID"),]
self.to_show = [(_("jid"), "Connection", "JabberID"),]
self.largest = max([len(item[0]) for item in self.to_show])
def add_parser_options(self):
self.parser.add_argument('--show-password', action='store_true', help=_(u'show the XMPP password IN CLEAR TEXT'))
self.parser.add_argument('--show-password', action='store_true', help=_('show the XMPP password IN CLEAR TEXT'))
def showNextValue(self, label=None, category=None, value=None):
"""Show next value from self.to_show and quit on last one"""
if label is not None:
print((u"{label:<"+unicode(self.largest+2)+"}{value}").format(label=label+": ", value=value))
print((("{label:<"+str(self.largest+2)+"}{value}").format(label=label+": ", value=value)))
try:
label, category, name = self.to_show.pop(0)
except IndexError:
@ -115,18 +115,18 @@ class ProfileInfo(base.CommandBase):
def start(self):
if self.args.show_password:
self.to_show.append((_(u"XMPP password"), "Connection", "Password"))
self.to_show.append((_("XMPP password"), "Connection", "Password"))
self.showNextValue()
class ProfileList(base.CommandBase):
def __init__(self, host):
super(ProfileList, self).__init__(host, 'list', use_profile=False, use_output='list', help=(u'list profiles'))
super(ProfileList, self).__init__(host, 'list', use_profile=False, use_output='list', help=('list profiles'))
def add_parser_options(self):
group = self.parser.add_mutually_exclusive_group()
group.add_argument('-c', '--clients', action='store_true', help=_(u'get clients profiles only'))
group.add_argument('-C', '--components', action='store_true', help=(u'get components profiles only'))
group.add_argument('-c', '--clients', action='store_true', help=_('get clients profiles only'))
group.add_argument('-C', '--components', action='store_true', help=('get components profiles only'))
def start(self):
@ -141,17 +141,17 @@ class ProfileList(base.CommandBase):
class ProfileCreate(base.CommandBase):
def __init__(self, host):
super(ProfileCreate, self).__init__(host, 'create', use_profile=False, help=(u'create a new profile'))
super(ProfileCreate, self).__init__(host, 'create', use_profile=False, help=('create a new profile'))
self.need_loop = True
def add_parser_options(self):
self.parser.add_argument('profile', type=str, help=_(u'the name of the profile'))
self.parser.add_argument('-p', '--password', type=str, default='', help=_(u'the password of the profile'))
self.parser.add_argument('-j', '--jid', type=str, help=_(u'the jid of the profile'))
self.parser.add_argument('-x', '--xmpp-password', type=str, help=_(u'the password of the XMPP account (use profile password if not specified)'),
self.parser.add_argument('profile', type=str, help=_('the name of the profile'))
self.parser.add_argument('-p', '--password', type=str, default='', help=_('the password of the profile'))
self.parser.add_argument('-j', '--jid', type=str, help=_('the jid of the profile'))
self.parser.add_argument('-x', '--xmpp-password', type=str, help=_('the password of the XMPP account (use profile password if not specified)'),
metavar='PASSWORD')
self.parser.add_argument('-C', '--component', type=base.unicode_decoder, default='',
help=_(u'set to component import name (entry point) if this is a component'))
self.parser.add_argument('-C', '--component', default='',
help=_('set to component import name (entry point) if this is a component'))
def _session_started(self, __):
if self.args.jid:
@ -172,22 +172,22 @@ class ProfileCreate(base.CommandBase):
self.host.bridge.profileCreate(self.args.profile, self.args.password, self.args.component,
callback=self._profile_created,
errback=partial(self.errback,
msg=_(u"can't create profile: {}"),
msg=_("can't create profile: {}"),
exit_code=C.EXIT_BRIDGE_ERRBACK))
class ProfileModify(base.CommandBase):
def __init__(self, host):
super(ProfileModify, self).__init__(host, 'modify', need_connect=False, help=_(u'modify an existing profile'))
super(ProfileModify, self).__init__(host, 'modify', need_connect=False, help=_('modify an existing profile'))
def add_parser_options(self):
profile_pwd_group = self.parser.add_mutually_exclusive_group()
profile_pwd_group.add_argument('-w', '--password', type=base.unicode_decoder, help=_(u'change the password of the profile'))
profile_pwd_group.add_argument('--disable-password', action='store_true', help=_(u'disable profile password (dangerous!)'))
self.parser.add_argument('-j', '--jid', type=base.unicode_decoder, help=_(u'the jid of the profile'))
self.parser.add_argument('-x', '--xmpp-password', type=base.unicode_decoder, help=_(u'change the password of the XMPP account'),
profile_pwd_group.add_argument('-w', '--password', help=_('change the password of the profile'))
profile_pwd_group.add_argument('--disable-password', action='store_true', help=_('disable profile password (dangerous!)'))
self.parser.add_argument('-j', '--jid', help=_('the jid of the profile'))
self.parser.add_argument('-x', '--xmpp-password', help=_('change the password of the XMPP account'),
metavar='PASSWORD')
self.parser.add_argument('-D', '--default', action='store_true', help=_(u'set as default profile'))
self.parser.add_argument('-D', '--default', action='store_true', help=_('set as default profile'))
def start(self):
if self.args.disable_password:
@ -206,4 +206,4 @@ class Profile(base.CommandBase):
subcommands = (ProfileConnect, ProfileDisconnect, ProfileCreate, ProfileDefault, ProfileDelete, ProfileInfo, ProfileList, ProfileModify)
def __init__(self, host):
super(Profile, self).__init__(host, 'profile', use_profile=False, help=_(u'profile commands'))
super(Profile, self).__init__(host, 'profile', use_profile=False, help=_('profile commands'))