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:
parent
d21a6a660f
commit
fbfe96c505
1 changed files with 6336 additions and 6398 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python2
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# SAT: a jabber client
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
import os
|
||||
import csv
|
||||
import json
|
||||
from ConfigParser import SafeConfigParser, DEFAULTSECT, NoOptionError, NoSectionError
|
||||
from configparser import SafeConfigParser, DEFAULTSECT, NoOptionError, NoSectionError
|
||||
from xdg import BaseDirectory
|
||||
from sat.core.log import getLogger
|
||||
from sat.core.constants import Const as C
|
||||
|
|
@ -48,7 +48,7 @@ def fixConfigOption(section, option, value, silent=True):
|
|||
# we will eventually update the existing file with the highest priority,
|
||||
# if it's a user personal file...
|
||||
if not silent:
|
||||
log.debug(_(u"Testing file %s") % file_)
|
||||
log.debug(_("Testing file %s") % file_)
|
||||
if os.path.isfile(file_):
|
||||
if file_.startswith(os.path.expanduser("~")):
|
||||
config.read([file_])
|
||||
|
|
@ -65,8 +65,8 @@ def fixConfigOption(section, option, value, silent=True):
|
|||
if not silent:
|
||||
if option in ("passphrase",): # list here the options storing a password
|
||||
value = "******"
|
||||
log.warning(_(u"Config auto-update: {option} set to {value} in the file "
|
||||
u"{config_file}.").format(option=option, value=value,
|
||||
log.warning(_("Config auto-update: {option} set to {value} in the file "
|
||||
"{config_file}.").format(option=option, value=value,
|
||||
config_file=target_file))
|
||||
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ def parseMainConf():
|
|||
try:
|
||||
config.read(C.CONFIG_FILES)
|
||||
except Exception as e:
|
||||
log.error(_(u"Can't read main config: {msg}").format(msg=e), exc_info=True)
|
||||
log.error(_("Can't read main config: {msg}").format(msg=e), exc_info=True)
|
||||
return config
|
||||
|
||||
|
||||
|
|
@ -96,7 +96,7 @@ def getConfig(config, section, name, default=None):
|
|||
section = DEFAULTSECT
|
||||
|
||||
try:
|
||||
value = config.get(section, name).decode("utf-8")
|
||||
value = config.get(section, name)
|
||||
except (NoOptionError, NoSectionError) as e:
|
||||
if default is Exception:
|
||||
raise e
|
||||
|
|
@ -106,21 +106,21 @@ def getConfig(config, section, name, default=None):
|
|||
value = os.path.expanduser(value)
|
||||
# thx to Brian (http://stackoverflow.com/questions/186857/splitting-a-semicolon-separated-string-to-a-dictionary-in-python/186873#186873)
|
||||
elif name.endswith("_list"):
|
||||
value = csv.reader(
|
||||
value = next(csv.reader(
|
||||
[value], delimiter=",", quotechar='"', skipinitialspace=True
|
||||
).next()
|
||||
))
|
||||
elif name.endswith("_dict"):
|
||||
try:
|
||||
value = json.loads(value)
|
||||
except ValueError as e:
|
||||
raise exceptions.ParsingError(u"Error while parsing data: {}".format(e))
|
||||
raise exceptions.ParsingError("Error while parsing data: {}".format(e))
|
||||
if not isinstance(value, dict):
|
||||
raise exceptions.ParsingError(
|
||||
u"{name} value is not a dict: {value}".format(name=name, value=value)
|
||||
"{name} value is not a dict: {value}".format(name=name, value=value)
|
||||
)
|
||||
elif name.endswith("_json"):
|
||||
try:
|
||||
value = json.loads(value)
|
||||
except ValueError as e:
|
||||
raise exceptions.ParsingError(u"Error while parsing data: {}".format(e))
|
||||
raise exceptions.ParsingError("Error while parsing data: {}".format(e))
|
||||
return value
|
||||
|
|
|
|||
Loading…
Reference in a new issue