Fixed #5778 -- Changed the way we detect if a string is non-ASCII whe…

…n 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

@@ -73,7 +73,7 @@ def __setitem__(self, name, val):
         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 @@ def __setitem__(self, name, val):
         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 = []