Ticket #14964: mail_attachment.diff

core/mail/message.py

@@ -11 +11 @@
 
 from django.conf import settings
 from django.core.mail.utils import DNS_NAME
-from django.utils.encoding import smart_str, force_unicode
+from django.utils.encoding import smart_str, force_unicode, iri_to_uri
 
 # Don't BASE64-encode UTF-8 messages so that we avoid unwanted attention from
 # some spam filters.
@@ -249 +249 @@
                 mimetype = DEFAULT_ATTACHMENT_MIME_TYPE
         attachment = self._create_mime_attachment(content, mimetype)
         if filename:
-            attachment.add_header('Content-Disposition', 'attachment',
-                                  filename=filename)
+            if all(ord(c) < 128 for c in filename):
+                params = {'filename': filename}
+            else:
+                params = {'filename': "UTF-8''%s" % iri_to_uri(filename)}}
+            attachment.add_header('Content-Disposition', 'attachment',**params)
         return attachment