Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #4910 -- Allow Unicode content to be passed in for text-based e…

…-mail

attachments. Thanks, djoume@taket.org.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1777e74d2a53f2b36a3106563c629f85133fbace 1 parent 35ce8a2
@malcolmt malcolmt authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  django/core/mail.py
View
3  django/core/mail.py
@@ -287,7 +287,8 @@ def _create_attachment(self, filename, content, mimetype=None):
mimetype = DEFAULT_ATTACHMENT_MIME_TYPE
basetype, subtype = mimetype.split('/', 1)
if basetype == 'text':
- attachment = SafeMIMEText(content, subtype, settings.DEFAULT_CHARSET)
+ attachment = SafeMIMEText(smart_str(content,
+ settings.DEFAULT_CHARSET), subtype, settings.DEFAULT_CHARSET)
else:
# Encode non-text attachments with base64.
attachment = MIMEBase(basetype, subtype)
Please sign in to comment.
Something went wrong with that request. Please try again.