From: Etienne Millon <etienne.millon@gmail.com>

Date: Mon, 20 Feb 2012 15:28:52 +0100

Subject: Prefer utf8 in CHARSET_LIST

Bug-Debian: http://bugs.debian.org/659920

---

 config.py.example |    2 +-

 rss2email.py      |    2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.py.example b/config.py.example

index cdd760b..ee2e004 100755

--- a/config.py.example

+++ b/config.py.example

@@ -91,4 +91,4 @@ PROXY=""

 # To most correctly encode emails with international characters, we iterate through the list below and use the first character set that works

 # Eventually (and theoretically) ISO-8859-1 and UTF-8 are our catch-all failsafes

-CHARSET_LIST='US-ASCII', 'BIG5', 'ISO-2022-JP', 'ISO-8859-1', 'UTF-8'

+CHARSET_LIST='US-ASCII', 'ISO-8859-1', 'UTF-8', 'BIG5', 'ISO-2022-JP'

diff --git a/rss2email.py b/rss2email.py

index 9735b28..69998db 100755

--- a/rss2email.py

+++ b/rss2email.py

@@ -108,7 +108,7 @@ PROXY=""

 # To most correctly encode emails with international characters, we iterate through the list below and use the first character set that works

 # Eventually (and theoretically) ISO-8859-1 and UTF-8 are our catch-all failsafes

-CHARSET_LIST='US-ASCII', 'BIG5', 'ISO-2022-JP', 'ISO-8859-1', 'UTF-8'

+CHARSET_LIST='US-ASCII', 'ISO-8859-1', 'UTF-8', 'BIG5', 'ISO-2022-JP'

 from email.MIMEText import MIMEText

 from email.Header import Header