Ticket #14301: bug14301.diff

django/core/mail/message.py

@@ -67 +67 @@
             result = []
             for nm, addr in getaddresses((val,)):
                 nm = str(Header(nm.encode(encoding), encoding))
-                result.append(formataddr((nm, str(addr))))
+                try:
+                    addr = addr.encode('ascii')
+                except UnicodeEncodeError:  # IDN
+                    addr = str(Header(addr.encode(encoding), encoding))
+                result.append(formataddr((nm, addr)))
             val = ', '.join(result)
         else:
             val = Header(val.encode(encoding), encoding)

tests/regressiontests/mail/tests.py

@@ -471 +471 @@
 >>> message.as_string()
 'Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: quoted-printable\nSubject: Subject\nFrom: from@example.com\nTo: to@example.com\nCc: cc@example.com\nDate: ...\nMessage-ID: <...>\n\nContent'
 
+# Allow IDN in send_mail (14301)
+
+>>> from_email = u'from@öäü.com'
+>>> to_email = u'to@öäü.com'
+>>> connection = mail.get_connection('django.core.mail.backends.console.EmailBackend')
+>>> send_mail('Subject', 'Content', from_email, [to_email], connection=connection)
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Subject: Subject
+From: =?utf-8?b?ZnJvbUDDg8K2w4PCpMODwrwuY29t?=
+To: =?utf-8?b?dG9Aw4PCtsODwqTDg8K8LmNvbQ==?=
+Date: ...
+Message-ID: ...
+
+Content
+-------------------------------------------------------------------------------
+1
+
 """