mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Refs #27753 -- Favored force/smart_str() over force/smart_text().

Browse Source
This commit is contained in:
Aymeric Augustin
2017-01-26 10:08:08 +01:00
committed by Tim Graham
parent 24b82cd201
commit 3bb6a4390c
21 changed files with 84 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/mail/message.py
View File

@@ -16,7 +16,7 @@ from pathlib import Path
from django.conf import settings
from django.core.mail.utils import DNS_NAME
from django.utils.encoding import force_text
from django.utils.encoding import force_str
# Don't BASE64-encode UTF-8 messages so that we avoid unwanted attention from
# some spam filters.
@@ -375,7 +375,7 @@ class EmailMessage:
elif not isinstance(content, Message):
# For compatibility with existing code, parse the message
# into an email.Message object if it is not one already.
content = message_from_string(force_text(content))
content = message_from_string(force_str(content))
attachment = SafeMIMEMessage(content, subtype)
else: