Setting encoding on EmailMessage does not produce intended result

[oyvind]

class MEmailMessage(EmailMessage):

    encoding = 'ISO-8859-1'

Produces a message with a header that says it is iso-8859-1, but the quoted-printable-encoded data in the body is utf-8.

class EmailMessage(object):

    ...

    def message(self):
        encoding = self.encoding or settings.DEFAULT_CHARSET
        msg = SafeMIMEText(smart_str(self.body, settings.DEFAULT_CHARSET),
                           self.content_subtype, encoding)

    ...

Should be:

class EmailMessage(object):

    ...

    def message(self):
        encoding = self.encoding or settings.DEFAULT_CHARSET
        msg = SafeMIMEText(smart_str(self.body, encoding),
                           self.content_subtype, encoding)

    ...

[Russell Keith-Magee]

I suspect this is a duplicate of #11924.

[oyvind]

Patch with tests

[oyvind]

Also works with MIME attachments

[oyvind]

A combination of the patches in #12791 and #6918 supporting different encodings both in body and headers.

[Russell Keith-Magee]

Apologies - you are correct. This is a different issue to #11924.

Given that the two issues are distinct, please keep the patches separate.

[Karen Tracey]

(In [12683]) Fixed #6918, #12791: If an email message has an encoding, actually use that encoding to encode body and headers. Thanks for patch with tests oyvind.

[Karen Tracey]

(In [12689]) [1.1.X] Fixed #6918, #12791: If an email message has an encoding, actually use that encoding to encode body and headers. Thanks for patch with tests oyvind.

Backport of r12683 and r12688 from trunk.

[Jacob]

Milestone 1.2 deleted