comparison sat/bridge/bridge_constructor/bridge_constructor.py @ 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 003b8b4b56a7
children 9d0df638c8b4
comparison
equal deleted inserted replaced
3027:ff5bcb12ae60 3028:ab2696e34d29
1 #!/usr/bin/env python2 1 #!/usr/bin/env python3
2 # -*- coding: utf-8 -*- 2 # -*- coding: utf-8 -*-
3 3
4 # SàT: a XMPP client 4 # SàT: a XMPP client
5 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org) 5 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org)
6 6
20 20
21 from sat.bridge import bridge_constructor 21 from sat.bridge import bridge_constructor
22 from sat.bridge.bridge_constructor.constants import Const as C 22 from sat.bridge.bridge_constructor.constants import Const as C
23 from sat.bridge.bridge_constructor import constructors, base_constructor 23 from sat.bridge.bridge_constructor import constructors, base_constructor
24 import argparse 24 import argparse
25 from ConfigParser import SafeConfigParser as Parser 25 from configparser import ConfigParser as Parser
26 from importlib import import_module 26 from importlib import import_module
27 import os 27 import os
28 import os.path 28 import os.path
29 29
30 # consts 30 # consts
85 os.path.dirname(bridge_constructor.__file__), "bridge_template.ini" 85 os.path.dirname(bridge_constructor.__file__), "bridge_template.ini"
86 ) 86 )
87 parser.add_argument( 87 parser.add_argument(
88 "-t", 88 "-t",
89 "--template", 89 "--template",
90 type=file, 90 type=argparse.FileType(),
91 default=default_template, 91 default=default_template,
92 help="use TEMPLATE to generate bridge (default: %(default)s)", 92 help="use TEMPLATE to generate bridge (default: %(default)s)",
93 ) 93 )
94 parser.add_argument( 94 parser.add_argument(
95 "-f", 95 "-f",