Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.6.x] Fixed #19107 -- Restored bug fix for sending unicode email with Python 2.6.5 and below.

Browse Source
This commit is contained in:
Tim Graham 2014-07-30 09:28:43 -04:00
parent 8567c1a3c2
commit e4b2bea743
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/mail/message.py
View File

@ -132,6 +132,8 @@ class MIMEMixin():
""" """
fp = six.StringIO() fp = six.StringIO()
g = generator.Generator(fp, mangle_from_=False) 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) g.flatten(self, unixfrom=unixfrom)
return fp.getvalue() return fp.getvalue()

3
docs/releases/1.6.6.txt
View File

@ -30,3 +30,6 @@ Bugfixes
* Fixed the "ORA-01843: not a valid month" errors when using Unicode * Fixed the "ORA-01843: not a valid month" errors when using Unicode
with older versions of Oracle server with older versions of Oracle server
(`#20292 <https://code.djangoproject.com/ticket/20292>`_). (`#20292 <https://code.djangoproject.com/ticket/20292>`_).
* Restored bug fix for sending unicode email with Python 2.6.5 and below
(`#19107 <https://code.djangoproject.com/ticket/19107>`_).