Mercurial > libervia-backend
diff sat/bridge/bridge_constructor/constructors/pb/pb_core_template.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 | 0f277708e2ae |
| children | a1bc34f90fa5 |
line wrap: on
line diff
--- a/sat/bridge/bridge_constructor/constructors/pb/pb_core_template.py Wed Jul 31 11:31:22 2019 +0200 +++ b/sat/bridge/bridge_constructor/constructors/pb/pb_core_template.py Tue Aug 13 19:08:41 2019 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # SAT: a jabber client @@ -46,11 +46,11 @@ def remote_initBridge(self, signals_handler): self.signals_handlers.append(signals_handler) - log.info(u"registered signal handler") + log.info("registered signal handler") def sendSignalEb(self, failure, signal_name): log.error( - u"Error while sending signal {name}: {msg}".format( + "Error while sending signal {name}: {msg}".format( name=signal_name, msg=failure ) ) @@ -66,27 +66,27 @@ d.addErrback(self.sendSignalEb, name) if to_remove: for handler in to_remove: - log.debug(u"Removing signal handler for dead frontend") + log.debug("Removing signal handler for dead frontend") self.signals_handlers.remove(handler) def _bridgeDeactivateSignals(self): if hasattr(self, "signals_paused"): - log.warning(u"bridge signals already deactivated") + log.warning("bridge signals already deactivated") if self.signals_handler: self.signals_paused.extend(self.signals_handler) else: self.signals_paused = self.signals_handlers self.signals_handlers = [] - log.debug(u"bridge signals have been deactivated") + log.debug("bridge signals have been deactivated") def _bridgeReactivateSignals(self): try: self.signals_handlers = self.signals_paused except AttributeError: - log.debug(u"signals were already activated") + log.debug("signals were already activated") else: del self.signals_paused - log.debug(u"bridge signals have been reactivated") + log.debug("bridge signals have been reactivated") ##METHODS_PART## @@ -102,14 +102,14 @@ def remote_initBridge(self, signals_handler): self.signals_handlers.append(signals_handler) - log.info(u"registered signal handler") + log.info("registered signal handler") def register_method(self, name, callback): log.debug("registering PB bridge method [%s]" % name) setattr(self.root, "remote_" + name, callback) # self.root.register_method(name, callback) - def addMethod(self, name, int_suffix, in_sign, out_sign, method, async=False, doc={}): + def addMethod(self, name, int_suffix, in_sign, out_sign, method, async_=False, doc={}): """Dynamically add a method to PB Bridge""" # FIXME: doc parameter is kept only temporary, the time to remove it from calls log.debug("Adding method {name} to PB bridge".format(name=name))