diff --git a/django/core/mail/message.py b/django/core/mail/message.py index 95762ff89d..5bcb588c10 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -132,6 +132,8 @@ class MIMEMixin(): """ fp = six.StringIO() g = generator.Generator(fp, mangle_from_=False) + if sys.version_info < (2, 6, 6) and isinstance(self._payload, six.text_type): + self._payload = self._payload.encode(self._charset.output_charset) g.flatten(self, unixfrom=unixfrom) return fp.getvalue() diff --git a/docs/releases/1.6.6.txt b/docs/releases/1.6.6.txt index fb182f5dcb..92c330dbca 100644 --- a/docs/releases/1.6.6.txt +++ b/docs/releases/1.6.6.txt @@ -30,3 +30,6 @@ Bugfixes * Fixed the "ORA-01843: not a valid month" errors when using Unicode with older versions of Oracle server (`#20292 `_). + +* Restored bug fix for sending unicode email with Python 2.6.5 and below + (`#19107 `_).