Django

Code

Changeset 6551

Show
Ignore:
Timestamp:
10/20/07 02:53:54 (1 year ago)
Author:
mtredinnick
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/mail.py

    r6270 r6551  
    7474            raise BadHeaderError, "Header values can't contain newlines (got %r for header %r)" % (val, name) 
    7575        try: 
    76             val = str(force_unicode(val)) 
     76            val = force_unicode(val).encode('ascii') 
    7777        except UnicodeEncodeError: 
    7878            if name.lower() in ('to', 'from', 'cc'): 
    …… 
    9393            raise BadHeaderError, "Header values can't contain newlines (got %r for header %r)" % (val, name) 
    9494        try: 
    95             val = str(force_unicode(val)) 
     95            val = force_unicode(val).encode('ascii') 
    9696        except UnicodeEncodeError: 
    9797            if name.lower() in ('to', 'from', 'cc'):