Context Navigation

Ticket #14964: 14964-2.diff

File 14964-2.diff, 1.8 KB (added by Claude Paroz, 12 years ago)
Handle non ASCII filenames v2 + test

diff --git a/django/core/mail/message.py b/django/core/mail/message.py
index 39f7afc..7347391 100644

                class EmailMessage(object):
                 mimetype = DEFAULT_ATTACHMENT_MIME_TYPE
         attachment = self._create_mime_attachment(content, mimetype)
         if filename:
+            try:
+                filename = filename.encode('ascii')
+            except UnicodeEncodeError:
+                filename = ('utf-8', '', filename.encode('utf-8'))
             attachment.add_header('Content-Disposition', 'attachment',
                                   filename=filename)
         return attachment

diff --git a/tests/regressiontests/mail/tests.py b/tests/regressiontests/mail/tests.py
index 52e251f..ed44cb9 100644

                class MailTests(TestCase):
         msg = EmailMultiAlternatives(subject, text_content, from_email, [to], headers=headers)
         msg.attach_alternative(html_content, "text/html")
         msg.attach("an attachment.pdf", "%PDF-1.4.%...", mimetype="application/pdf")
+        # Test also with unicode in file name
+        msg.attach(u"une pièce jointe.pdf", "%PDF-1.4.%...", mimetype="application/pdf")
         msg_str = msg.message().as_string()
         message = email.message_from_string(msg_str)
         self.assertTrue(message.is_multipart())
-…
+               class MailTests(TestCase):
         payload = message.get_payload()
         self.assertEqual(payload[0].get_content_type(), 'multipart/alternative')
         self.assertEqual(payload[1].get_content_type(), 'application/pdf')
+        self.assertEqual(payload[2].get_filename(), u'une pièce jointe.pdf')
     def test_dummy_backend(self):
         """