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 -*-
# SàT: a XMPP client
@ -67,7 +67,7 @@ class Logger(object):
"""
if kwargs.get('exc_info', False):
message = self.addTraceback(message)
print message
print(message)
def log(self, level, message, **kwargs):
"""Print message
@ -197,7 +197,7 @@ class ConfigureBase(object):
"""update existing logger to the class needed for this backend"""
if self.LOGGER_CLASS is None:
return
for name, logger in _loggers.items():
for name, logger in list(_loggers.items()):
_loggers[name] = self.LOGGER_CLASS(logger)
def preTreatment(self):
@ -235,7 +235,7 @@ class ConfigureBase(object):
def configureColors(self, colors, force_colors, levels_taints_dict):
if colors:
# if color are used, we need to handle levels_taints_dict
for level in levels_taints_dict.keys():
for level in list(levels_taints_dict.keys()):
# we wants levels in uppercase to correspond to contstants
levels_taints_dict[level.upper()] = levels_taints_dict[level]
taints = self.__class__.taints = {}
@ -283,7 +283,7 @@ class ConfigureBase(object):
options = None
if output not in (C.LOG_OPT_OUTPUT_DEFAULT, C.LOG_OPT_OUTPUT_FILE, C.LOG_OPT_OUTPUT_MEMORY):
raise ValueError(u"Invalid output [%s]" % output)
raise ValueError("Invalid output [%s]" % output)
if output == C.LOG_OPT_OUTPUT_DEFAULT:
# no option for defaut handler
@ -303,7 +303,7 @@ class ConfigureBase(object):
handlers[output] = limit
if options: # we should not have unparsed options
raise ValueError(u"options [{options}] are not supported for {handler} output".format(options=options, handler=output))
raise ValueError("options [{options}] are not supported for {handler} output".format(options=options, handler=output))
@staticmethod
def memoryGet(size=None):