Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214

  • django/branches/gis/django/core/mail.py

    r7918 r8215  
    7272def forbid_multi_line_headers(name, val): 
    7373    """Forbids multi-line headers, to prevent header injection.""" 
     74    val = force_unicode(val) 
    7475    if '\n' in val or '\r' in val: 
    7576        raise BadHeaderError("Header values can't contain newlines (got %r for header %r)" % (val, name)) 
    7677    try: 
    77         val = force_unicode(val).encode('ascii') 
     78        val = val.encode('ascii') 
    7879    except UnicodeEncodeError: 
    7980        if name.lower() in ('to', 'from', 'cc'): 
    …… 
    8586            val = ', '.join(result) 
    8687        else: 
    87             val = Header(force_unicode(val), settings.DEFAULT_CHARSET) 
     88            val = Header(val, settings.DEFAULT_CHARSET) 
    8889    return name, val 
    8990 
    …… 
    175176    def _send(self, email_message): 
    176177        """A helper method that does the actual sending.""" 
    177         if not email_message.to: 
     178        if not email_message.recipients(): 
    178179            return False 
    179180        try: