mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-13 10:23:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#20531: Apply the 3.3 version of the #19063 fix.

Browse source 
So passing unicode to set_payload works again (but still doesn't
do what you want when the message is serialized).
This commit is contained in:
R David Murray 2014-02-07 12:46:17 -05:00
parent 27e9de669b
commit 15a693a6f8
4 changed files with 62 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/email/message.py
View file

@ -301,9 +301,19 @@ class Message:
Optional charset sets the message's default character set. See
set_charset() for details.
"""
if isinstance(payload, bytes):
payload = payload.decode('ascii', 'surrogateescape')
self._payload = payload
if hasattr(payload, 'encode'):
if charset is None:
# We should check for ASCII-only here, but we can't do that
# for backward compatibility reasons. Fixed in 3.4.
self._payload = payload
return
if not isinstance(charset, Charset):
charset = Charset(charset)
payload = payload.encode(charset.output_charset)
if hasattr(payload, 'decode'):
self._payload = payload.decode('ascii', 'surrogateescape')
else:
self._payload = payload
if charset is not None:
self.set_charset(charset)
@ -342,7 +352,15 @@ class Message:
try:
cte(self)
except TypeError:
self._payload = charset.body_encode(self._payload)
# This if is for backward compatibility and will be removed
# in 3.4 when the ascii check is added to set_payload.
payload = self._payload
if payload:
try:
payload = payload.encode('ascii', 'surrogateescape')
except UnicodeError:
payload = payload.encode(charset.output_charset)
self._payload = charset.body_encode(payload)
self.add_header('Content-Transfer-Encoding', cte)
def get_charset(self):