From a0fdd7c7dd263cc0718d0e54597f9da414fd775c Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sat, 20 Oct 2007 07:53:54 +0000 Subject: [PATCH] Fixed #5778 -- Changed the way we detect if a string is non-ASCII when creating email headers. This fixes a problem that was showing up on some (but not all) systems. git-svn-id: http://code.djangoproject.com/svn/django/trunk@6551 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/mail.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/core/mail.py b/django/core/mail.py index b90752e649..77ab8007e6 100644 --- a/django/core/mail.py +++ b/django/core/mail.py @@ -73,7 +73,7 @@ class SafeMIMEText(MIMEText): if '\n' in val or '\r' in val: raise BadHeaderError, "Header values can't contain newlines (got %r for header %r)" % (val, name) try: - val = str(force_unicode(val)) + val = force_unicode(val).encode('ascii') except UnicodeEncodeError: if name.lower() in ('to', 'from', 'cc'): result = [] @@ -92,7 +92,7 @@ class SafeMIMEMultipart(MIMEMultipart): if '\n' in val or '\r' in val: raise BadHeaderError, "Header values can't contain newlines (got %r for header %r)" % (val, name) try: - val = str(force_unicode(val)) + val = force_unicode(val).encode('ascii') except UnicodeEncodeError: if name.lower() in ('to', 'from', 'cc'): result = []