Mercurial > libervia-backend

diff sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py @ 3028:ab2696e34d29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c2625920e05a
line wrap: on
line diff
--- a/sat/bridge/bridge_constructor/constructors/embedded/embedded_template.py	Wed Jul 31 11:31:22 2019 +0200
+++ b/sat/bridge/bridge_constructor/constructors/embedded/embedded_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 -*-
 
 # SàT: a XMPP client
@@ -25,7 +25,7 @@
 
 class _Bridge(object):
     def __init__(self):
-        log.debug(u"Init embedded bridge...")
+        log.debug("Init embedded bridge...")
         self._methods_cbs = {}
         self._signals_cbs = {"core": {}, "plugin": {}}
 
@@ -33,16 +33,16 @@
         callback()
 
     def register_method(self, name, callback):
-        log.debug(u"registering embedded bridge method [{}]".format(name))
+        log.debug("registering embedded bridge method [{}]".format(name))
         if name in self._methods_cbs:
-            raise exceptions.ConflictError(u"method {} is already regitered".format(name))
+            raise exceptions.ConflictError("method {} is already regitered".format(name))
         self._methods_cbs[name] = callback
 
     def register_signal(self, functionName, handler, iface="core"):
         iface_dict = self._signals_cbs[iface]
         if functionName in iface_dict:
             raise exceptions.ConflictError(
-                u"signal {name} is already regitered for interface {iface}".format(
+                "signal {name} is already regitered for interface {iface}".format(
                     name=functionName, iface=iface
                 )
             )
@@ -81,11 +81,11 @@
         try:
             cb = self._signals_cbs["plugin"][name]
         except KeyError:
-            log.debug(u"ignoring signal {}: no callback registered".format(name))
+            log.debug("ignoring signal {}: no callback registered".format(name))
         else:
             cb(*args, **kwargs)
 
-    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={}):
         # FIXME: doc parameter is kept only temporary, the time to remove it from calls
         log.debug("Adding method [{}] to embedded bridge".format(name))
         self.register_method(name, method)