diff bin/sat @ 3028:ab2696e34d29

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
author Goffi <goffi@goffi.org>
date Tue, 13 Aug 2019 19:08:41 +0200
parents 26edcf3a30eb
children 8b36e5c3f28f
line wrap: on
line diff
--- a/bin/sat	Wed Jul 31 11:31:22 2019 +0200
+++ b/bin/sat	Tue Aug 13 19:08:41 2019 +0200
@@ -2,7 +2,7 @@
 
 DEBUG=""
 DAEMON=""
-PYTHON="python2"
+PYTHON="python3"
 TWISTD="$(which twistd)"
 
 kill_process() {
@@ -29,17 +29,13 @@
 eval `"$PYTHON" << PYTHONEND
 from sat.core.constants import Const as C
 from sat.memory.memory import fixLocalDir
-from ConfigParser import SafeConfigParser
+from configparser import ConfigParser
 from os.path import expanduser, join
 import sys
-import codecs
-import locale
-
-sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.stdout)
 
 fixLocalDir()  # XXX: tmp update code, will be removed in the future
 
-config = SafeConfigParser(defaults=C.DEFAULT_CONFIG)
+config = ConfigParser(defaults=C.DEFAULT_CONFIG)
 try:
     config.read(C.CONFIG_FILES)
 except:
@@ -52,7 +48,7 @@
 env.append("LOG_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'log_dir')),''))
 env.append("APP_NAME='%s'" % C.APP_NAME)
 env.append("APP_NAME_FILE='%s'" % C.APP_NAME_FILE)
-print ";".join(env)
+print (";".join(env))
 PYTHONEND
 `
 APP_NAME="$APP_NAME"