typos and misconfigurations

diff --git a/config.py b/config.py
index 96784910c5afa61a5541feabcf21e4eb7725864b..9f2768f87ceaf95401214db06f036d68ab919b3d 100644 (file)
--- a/config.py
+++ b/config.py
@@ -99,4 +99,4 @@ times_up_delays = [60*10, 60*20]
 times_up_sentences = [u"I stayed alive, you're too slow !!!"]
 
 ignored_pseudos = r'^Soldat\d+$'
-ignored_pan_masks = [r'*!leger@zamok.crans.org', u"jben!*@*"]
+ignored_pan_masks = [("*!leger@zamok.crans.org", "jben!*@*")]

diff --git a/saturnin.py b/saturnin.py
index 3b43531fb133e9c3f8d04afd321438432c90e348..4903ec32892e35832c00df7351d9205f36b349e2 100755 (executable)
--- a/saturnin.py
+++ b/saturnin.py
@@ -60,7 +60,7 @@ def ignore_pan(serv, ev):
     """Retourne ``True`` si il faut ignorer ce pan."""
     for (blackmask, exceptmask) in config.ignored_pan_masks:
         usermask = ev.source()
-        return bool(irclib.mask_matches(usermask, blackmask) and not irclib.mask_matches(usermasl, exceptmask))
+        return bool(irclib.mask_matches(usermask, blackmask) and not irclib.mask_matches(usermask, exceptmask))
 
 class UnicodeBotError(Exception):
     pass