Merge #250: fix crash on IRC notice with non-ascii characters

9ce9ee5 fix encode crash on irc notice (undeath)

jmdaemon/jmdaemon/irc.py

@@ -19,11 +19,20 @@
 def wlog(*x):
     """Simplifier to add lists to the debug log
     """
+    def conv(s):
+        # note: this only works because of the future package
+        if isinstance(s, str):
+            return s
+        elif isinstance(s, bytes):
+            return s.decode('utf-8', errors='ignore')
+        else:
+            return str(s)
+
     if x[0] == "WARNING":
-        msg = " ".join([str(a) for a in x[1:]])
+        msg = " ".join([conv(a) for a in x[1:]])
         log.warn(msg)
     else:
-        msg = " ".join([str(a) for a in x])
+        msg = " ".join([conv(a) for a in x])
         log.debug(msg)
 
 def get_irc_text(line):
@@ -402,4 +411,4 @@ def left(self, channel):
         #wlog('(unhandled) left: ', channel)
 
     def noticed(self, user, channel, message):
-        wlog('(unhandled) noticed: ', user, channel, message)
+        wlog('(unhandled) noticed: ', user, channel, message)