From 63f7b35cf844d49bc2044ef7d133c34417028fff Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 6 Mar 2013 12:21:22 -0600 Subject: [PATCH] fixed issue 1364, unicode in emails, thanks Corne --- VERSION | 2 +- gluon/tools.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 1beeb15c..e6b375a4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.2-stable+timestamp.2013.03.05.14.28.56 +Version 2.4.2-stable+timestamp.2013.03.06.12.20.41 diff --git a/gluon/tools.py b/gluon/tools.py index fa17e6c9..2156d425 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -22,7 +22,7 @@ import urllib import urllib2 import Cookie import cStringIO -from email import MIMEBase, MIMEMultipart, MIMEText, Encoders, Header, message_from_string +from email import MIMEBase, MIMEMultipart, MIMEText, Encoders, Header, message_from_string, Charset from gluon.contenttype import contenttype from gluon.storage import Storage, StorageList, Settings, Messages @@ -347,7 +347,10 @@ class Mail(object): mail.send_mail() method self.error: Exception message or None if above was successful """ - + + # We don't want to use base64 encoding for unicode mail + Charset.add_charset('utf-8', Charset.QP, Charset.QP, 'utf-8') + def encode_header(key): if [c for c in key if 32 > ord(c) or ord(c) > 127]: return Header.Header(key.encode('utf-8'), 'utf-8')