Ticket #6299: patch_6299.txt

Index: /home/joe/code/workspaces/clinicnotes/clinicnotes/src_django/django/core/mail.py
===================================================================
--- /home/joe/code/workspaces/clinicnotes/clinicnotes/src_django/django/core/mail.py    (revision 6988)
+++ /home/joe/code/workspaces/clinicnotes/clinicnotes/src_django/django/core/mail.py    (working copy)
@@ -68,21 +68,21 @@
     pass
 
 def forbid_multi_line_headers(name, val):
-        "Forbids multi-line headers, to prevent header injection."
-        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 = force_unicode(val).encode('ascii')
-        except UnicodeEncodeError:
-            if name.lower() in ('to', 'from', 'cc'):
-                result = []
-                for item in val.split(', '):
-                    nm, addr = parseaddr(item)
-                    nm = str(Header(nm, settings.DEFAULT_CHARSET))
-                    result.append(formataddr((nm, str(addr))))
-                val = ', '.join(result)
-            else:
-                val = Header(force_unicode(val), settings.DEFAULT_CHARSET)
+    "Forbids multi-line headers, to prevent header injection."
+    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 = force_unicode(val).encode('ascii')
+    except UnicodeEncodeError:
+        if name.lower() in ('to', 'from', 'cc'):
+            result = []
+            for item in val.split(', '):
+                nm, addr = parseaddr(item)
+                nm = str(Header(nm, settings.DEFAULT_CHARSET))
+                result.append(formataddr((nm, str(addr))))
+            val = ', '.join(result)
+        else:
+            val = Header(force_unicode(val), settings.DEFAULT_CHARSET)
     return (name, val)
 
 class SafeMIMEText(MIMEText):