From 5b8da0ce53fb6e1b2efed0906381a313d95b3778 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Thu, 5 Mar 2015 16:45:47 +0100 Subject: Fixed problem when doding mails and with non utf-8 charset. --- service/pixelated/adapter/model/mail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service/pixelated') diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py index f912680f..951e6a21 100644 --- a/service/pixelated/adapter/model/mail.py +++ b/service/pixelated/adapter/model/mail.py @@ -82,7 +82,7 @@ class Mail(object): def _parse_charset_header(self, charset_header, default_charset='utf-8'): try: - return re.compile('.*charset=(.*);').match(charset_header).group(1) + return re.compile('.*charset=([a-zA-Z0-9-]+)').match(charset_header).group(1) except: return default_charset -- cgit v1.2.3