NoLatin1: enhance testNoWarningOnUnicode and fix detection.

NoLatin1/plugin.py

@@ -29,6 +29,7 @@
 ###
 
 import time
+import chardet
 import supybot.utils as utils
 from supybot.commands import *
 import supybot.plugins as plugins
@@ -51,9 +52,8 @@ class NoLatin1(callbacks.Plugin):
         content = msg.args[1]
         if not self.registryValue('enable', channel):
             return
-        try:
-            unicode(content, errors='strict')
-        except UnicodeDecodeError:
+        encoding = chardet.detect(content)['encoding']
+        if encoding not in ('utf-8', 'ascii'):
             self._warn(irc, channel, msg.prefix.split('!')[0])
 
     def _warn(self, irc, channel, nick):

NoLatin1/test.py

@@ -1,3 +1,4 @@
+# -*- coding: utf8 -*-
 ###
 # Copyright (c) 2011, Valentin Lorentz
 # All rights reserved.
@@ -46,7 +47,12 @@ class NoLatin1TestCase(ChannelPluginTestCase):
     def testNoWarningOnUnicode(self):
         msg = ircmsgs.privmsg(self.channel, 'Hi !', prefix=self.prefix)
         self.irc.feedMsg(msg)
-        assert self.irc.takeMsg() is None
+        msg = self.irc.takeMsg()
+        assert msg is None, msg
+        msg = ircmsgs.privmsg(self.channel, 'é', prefix=self.prefix)
+        self.irc.feedMsg(msg)
+        msg = self.irc.takeMsg()
+        assert msg is None, msg
 
     def testCleanUp(self):
         for foo in range(0, 4):