Unicode fix

[bots/basile.git] / nk.py

diff --git a/nk.py b/nk.py
index f7f4bb30d378766aa541bef42ceee82e5f286ab3..a9e8a5c9d923b11d27cbb596cdd9e9e015bf7a2d 100644 (file)
--- a/nk.py
+++ b/nk.py
@@ -97,7 +97,7 @@ def get_solde(sock, idbde, serv, canal):
             pseudo = ret["msg"]["pseudo"]
             return (True, solde, pseudo)
         else:
-            serv.privmsg(canal, ret["errmsg"])
+            serv.privmsg(canal, ret["errmsg"].encode("utf-8"))
             return (False, None, None)
     except Exception as exc:
         trace = traceback.format_exc()
@@ -115,14 +115,17 @@ def consomme(sock, idbde, conso, serv, canal):
         retcode = ret["retcode"]
         if retcode == 0:
             boutons = ret["msg"]
-            ibouton = [b["label"].lower() for b in boutons].index(conso.lower())
-            bouton = boutons[ibouton]
+            boutons = [b for b in boutons if b["label"].lower() == conso.lower()]
+            if len(boutons) == 0:
+                serv.privmsg(canal, (u"Impossible de trouver la conso %s" % (conso)).encode("utf-8"))
+                return False
+            bouton = boutons[0]
             sock.write(json.dumps(["consos", [[bouton["id"], idbde, 1]]]))
             ret = full_read(sock)
             if ret["retcode"] == 0:
                 [[retcode, [idbouton, idbde], errmsg]] = ret["msg"]
                 if retcode != 0:
-                    serv.privmsg(canal, errmsg)
+                    serv.privmsg(canal, errmsg.encode("utf-8"))
                 else:
                     success, solde, pseudo = get_solde(sock, idbde, serv, canal)
                     if success: