test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Worked around a bug in python 3.3.3. Refs #21093

This commit is contained in:
Florian Apolloner 2013-12-28 15:24:25 +01:00
parent 6a6136141b
commit 280c1a65cc
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,14 @@ class SafeMIMEText(MIMEMixin, MIMEText):
# We do it manually and trigger re-encoding of the payload. # We do it manually and trigger re-encoding of the payload.
MIMEText.__init__(self, text, subtype, None) MIMEText.__init__(self, text, subtype, None)
del self['Content-Transfer-Encoding'] del self['Content-Transfer-Encoding']
self.set_payload(text, utf8_charset) # Work around a bug in python 3.3.3 [sic], see
# http://bugs.python.org/issue19063 for details.
if sys.version_info[:3] == (3, 3, 3):
payload = text.encode(utf8_charset.output_charset)
self._payload = payload.decode('ascii', 'surrogateescape')
self.set_charset(utf8_charset)
else:
self.set_payload(text, utf8_charset)
self.replace_header('Content-Type', 'text/%s; charset="%s"' % (subtype, charset)) self.replace_header('Content-Type', 'text/%s; charset="%s"' % (subtype, charset))
else: else:
MIMEText.__init__(self, text, subtype, charset) MIMEText.__init__(self, text, subtype, charset)