Ticket #12791: emailmessage-body-encoding.diff

django/core/mail/message.py

@@ -131 +131 @@
 
     def message(self):
         encoding = self.encoding or settings.DEFAULT_CHARSET
-        msg = SafeMIMEText(smart_str(self.body, settings.DEFAULT_CHARSET),
+        msg = SafeMIMEText(smart_str(self.body, encoding),
                            self.content_subtype, encoding)
         msg = self._create_message(msg)
         msg['Subject'] = self.subject

tests/regressiontests/mail/tests.py

@@ -112 +112 @@
 >>> email.message()['To']
 '=?utf-8?q?S=C3=BCrname=2C_Firstname?= <to@example.com>, other@example.com'
 
-# Handle attachments within an multipart/alternative mail correctly (#9367)
-# (test is not as precise/clear as it could be w.r.t. email tree structure,
-#  but it's good enough.)
+# Regression for #12791  - Encode body correctly with other encodings than utf-8
+>>> email = EmailMessage('Subject', 'Æ e trønder æ å hærregud kor tøff æ e', 'from@example.com', ['other@example.com'])
+>>> message = email.message()
+>>> 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: other@example.com\nDate: ...\nMessage-ID: <...>\n\n=C3=86 e tr=C3=B8nder =C3=A6 =C3=A5 h=C3=A6rregud kor t=C3=B8ff =C3=A6 e'
 
+>>> email.encoding = 'iso-8859-1'
+>>> message = email.message()
+>>> message.as_string()
+'Content-Type: text/plain; charset="iso-8859-1"\nMIME-Version: 1.0\nContent-Transfer-Encoding: quoted-printable\nSubject: Subject\nFrom: from@example.com\nTo: other@example.com\nDate: ...\nMessage-ID: <...>\n\n=C6 e tr=F8nder =E6 =E5 h=E6rregud kor t=F8ff =E6 e'
+
 >>> headers = {"Date": "Fri, 09 Nov 2001 01:08:47 -0000", "Message-ID": "foo"}
 >>> subject, from_email, to = 'hello', 'from@example.com', 'to@example.com'
 >>> text_content = 'This is an important message.'