mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge #18324: set_payload now correctly handles binary input.

Browse source
This commit is contained in:
R David Murray 2013-08-21 21:13:51 -04:00
commit b8c537094d
4 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/email/message.py
View file

@ -303,6 +303,8 @@ 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 charset is not None:
self.set_charset(charset)