diff --git a/.travis.yml b/.travis.yml index 4ffef7335..47252fcff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,3 @@ script: - echo $TRAVIS_PYTHON_VERSION - python setup.py install - supybot-test test --plugins-dir=./build/lib*/supybot/plugins/ --no-network --disable-multiprocessing --exclude=./build/lib*/supybot/plugins/Scheduler --exclude=./build/lib*/supybot/plugins/Filter -notifications: - irc: - channels: - - "chat.freenode.net#limnoria" - on_success: change diff --git a/plugins/Aka/locales/fi.po b/plugins/Aka/locales/fi.po index 119a0aa76..0e47fd2c0 100644 --- a/plugins/Aka/locales/fi.po +++ b/plugins/Aka/locales/fi.po @@ -1,6 +1,6 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR ORGANIZATION -# FIRST AUTHOR , YEAR. +# Aka plugin for Limnoria +# Copyright (C) 2014 Limnoria +# Mikaela Suomalainen , 2014. # msgid "" msgstr "" diff --git a/plugins/RSS/plugin.py b/plugins/RSS/plugin.py index 7807f4b70..b8c81a011 100644 --- a/plugins/RSS/plugin.py +++ b/plugins/RSS/plugin.py @@ -151,13 +151,21 @@ class RSS(callbacks.Plugin): pubDate = ' [%s]' % (headline[2],) if sys.version_info[0] < 3: if isinstance(headline[0], unicode): + try: + import charade.universaldetector + u = charade.universaldetector.UniversalDetector() + u.feed(headline[0]) + u.close() + encoding = u.result['encoding'] + except ImportError: + encoding = 'utf8' newheadlines.append(format('%s %u%s', - headline[0].encode('utf-8','replace'), + headline[0].encode(encoding,'replace'), link, pubDate)) else: newheadlines.append(format('%s %u%s', - headline[0].decode('utf-8','replace'), + headline[0], link, pubDate)) else: