diff src/browser/sat_browser/json.py @ 694:82123705474b

massive (preventive) addition of 'u' (unicode) before the strings passed to logging functions
author souliane <souliane@mailoo.org>
date Thu, 16 Apr 2015 14:57:02 +0200
parents 7a9c7b9f6a28
children b395d1309936
line wrap: on
line diff
--- a/src/browser/sat_browser/json.py	Thu Apr 16 13:29:26 2015 +0200
+++ b/src/browser/sat_browser/json.py	Thu Apr 16 14:57:02 2015 +0200
@@ -71,7 +71,7 @@
 
         if kwargs:
             # kwargs should be empty here, we don't manage keyword arguments on bridge calls
-            log.error("kwargs is not empty after treatment on method call: kwargs={}".format(kwargs))
+            log.error(u"kwargs is not empty after treatment on method call: kwargs={}".format(kwargs))
 
         id_ = self._parent.callMethod(self._method, args)
 
@@ -95,7 +95,7 @@
     def _registerMethods(self, methods):
         if methods:
             for method in methods:
-                log.debug("Registering JSON method call [{}]".format(method))
+                log.debug(u"Registering JSON method call [{}]".format(method))
                 setattr(self,
                         method,
                         getattr(LiberviaMethodProxy(self, method), 'call')
@@ -108,7 +108,7 @@
     def call(self, method, cb, *args):
         # FIXME: deprecated call method, must be removed once it's not used anymore
         id_ = self.callMethod(method, args)
-        log.debug("call: method={} [id={}], args={}".format(method, id_, args))
+        log.debug(u"call: method={} [id={}], args={}".format(method, id_, args))
         if cb:
             if isinstance(cb, tuple):
                 if len(cb) != 2:
@@ -155,9 +155,9 @@
                     dump(o)"""
             else:
                 if isinstance(errobj['message'], dict):
-                    log.error("Error %s: %s" % (errobj['message']['faultCode'], errobj['message']['faultString']))
+                    log.error(u"Error %s: %s" % (errobj['message']['faultCode'], errobj['message']['faultString']))
                 else:
-                    log.error("%s" % errobj['message'])
+                    log.error(u"%s" % errobj['message'])
         else:
             _eb((code, errobj))
             del self.eb[request_info.id]
@@ -237,7 +237,7 @@
                 log.info("Trying to reconnect to server...")
                 self.getSignals(callback=self.signalHandler)
             # TODO: display a notification to user
-            log.warning("Lost connection, trying to reconnect in {} s".format(self.retry_delay/1000))
+            log.warning(u"Lost connection, trying to reconnect in {} s".format(self.retry_delay / 1000))
             Timer(notify=_timerCb).schedule(self.retry_delay)
             self.retry_delay *= 2
 
@@ -248,9 +248,9 @@
         @param callback: method to call
         @param with_profile: True if the original bridge method need a profile
         """
-        log.debug("Registering signal {}".format(name))
+        log.debug(u"Registering signal {}".format(name))
         if name in self._signals:
-            log.error("Trying to register and already registered signal ({})".format(name))
+            log.error(u"Trying to register and already registered signal ({})".format(name))
         else:
             self._signals[name] = (callback, with_profile)
 
@@ -258,12 +258,12 @@
         self.getSignals(callback=self.signalHandler)
         if len(signal_data) == 1:
             signal_data.append([])
-        log.debug("Got signal ==> name: %s, params: %s" % (signal_data[0], signal_data[1]))
+        log.debug(u"Got signal ==> name: %s, params: %s" % (signal_data[0], signal_data[1]))
         name, args = signal_data
         try:
             callback, with_profile = self._signals[name]
         except KeyError:
-            log.warning("Ignoring {} signal: no handler registered !".format(name))
+            log.warning(u"Ignoring {} signal: no handler registered !".format(name))
             return
         if with_profile:
             args.append(C.PROF_KEY_NONE)