p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.6.x] Decode mails using the message encoding. 

Backport of bfe9052831 from master.
This commit is contained in:
Florian Apolloner 2013-12-30 23:54:12 +01:00
parent d18f99dfc7
commit e99eeefe44
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/core/mail/backends/console.py
View File

@ -14,10 +14,12 @@ class EmailBackend(BaseEmailBackend):
super(EmailBackend, self).__init__(*args, **kwargs) super(EmailBackend, self).__init__(*args, **kwargs)
def write_message(self, message): def write_message(self, message):
msg = message.message().as_bytes() msg = message.message()
msg_data = msg.as_bytes()
if six.PY3: if six.PY3:
msg = msg.decode() charset = msg.get_charset().get_output_charset() if msg.get_charset() else 'utf-8'
self.stream.write('%s\n' % msg) msg_data = msg_data.decode(charset)
self.stream.write('%s\n' % msg_data)
self.stream.write('-' * 79) self.stream.write('-' * 79)
self.stream.write('\n') self.stream.write('\n')