Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-02 17:29:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into testing

Browse Source
This commit is contained in:
Valentin Lorentz 2012-02-18 13:01:06 +01:00
commit 68bcffb57b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/RSS/plugin.py
View File

@ -291,10 +291,12 @@ class RSS(callbacks.Plugin):
toText = utils.web.htmlToText
if 'encoding' in feed:
def conv(s):
try:
return toText(s).strip().encode(feed['encoding'],'replace')
except UnicodeEncodeError:
return toText(s.encode('utf-8', 'ignore')).strip()
# encode() first so there implicit encoding doesn't happen in
# other functions when unicode and bytestring objects are used
# together
s = s.encode(feed['encoding'], 'replace')
s = toText(s).strip()
return s
return conv
else:
return lambda s: toText(s).strip()