X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=dbuscron%2Flogger.py;h=59ddf59f1bc19e753e966deaafa39470d9c7cba2;hb=2244921ed917e5f33ec213e5ad13ae3e01c118fd;hp=cc96cc160c84d346197b64ed0a3b98c9e85a573c;hpb=852d622d56b3878bace13035d8b8311750a55f5d;p=dbuscron

diff --git a/dbuscron/logger.py b/dbuscron/logger.py
index cc96cc1..59ddf59 100644
--- a/dbuscron/logger.py
+++ b/dbuscron/logger.py
@@ -32,10 +32,18 @@ class Logger(object):
     level = property(_get_level, _set_level)
 
     def log(self, level, *message):
-        if level <= self.__level:
-            msg = ' '.join(str(m) for m in message)
-            ts = datetime.now().strftime('%Y-%m-%d %H:%M')
-            self.__out.write('[%s] %s\n' % (ts, msg))
+        if level > self.__level:
+            return
+
+        def ucode(m):
+            try:
+                return str(m)
+            except UnicodeEncodeError:
+                return unicode(m).encode('utf-8')
+
+        msg = ' '.join(map(ucode, message))
+        ts = datetime.now().strftime('%Y-%m-%d %H:%M')
+        self.__out.write('[%s] %s\n' % (ts, msg))
 
     def debug(self, *message):
         self.log(self.DEBUG, *message)