Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-11 20:52:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'athemis/master' into testing

Browse Source
This commit is contained in:
Valentin Lorentz 2013-01-20 15:16:53 +01:00
commit 6d15d263f0
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/drivers/Socket.py
View File

@ -45,6 +45,14 @@ import supybot.world as world
import supybot.drivers as drivers
import supybot.schedule as schedule
from itertools import imap
try:
from chardet.universaldetector import UniversalDetector
chardetLoaded = True
except:
drivers.log.debug('chardet module not available, '
'cannot guess character encoding if'
'using Python3')
chardetLoaded = False
try:
import ssl
SSLError = ssl.SSLError
@ -184,7 +192,27 @@ class SocketDriver(drivers.IrcDriver, drivers.ServersMixin):
self.inbuffer = lines.pop()
for line in lines:
if sys.version_info[0] >= 3:
#first, try to decode using utf-8
try:
line = line.decode(encoding='utf-8', errors='strict')
except UnicodeError:
# if this fails and chardet is loaded, try to guess the correct encoding
if chardetLoaded:
u = UniversalDetector()
u.feed(line)
u.close()
if u.result['encoding']:
# try to use the guessed encoding
try:
line = line.decode(u.result['encoding'], errors='strict')
# on error, give up and replace the offending characters
except UnicodeError:
line = line.decode(errors='replace')
# if chardet is not loaded, try to decode using utf-8 and replace any
# offending characters
else:
line = line.decode(encoding='utf-8', errors='replace')
msg = drivers.parseMsg(line)
if msg is not None:
self.irc.feedMsg(msg)