mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-02 23:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge: #19063: the unicode-in-set_payload problem isn't getting fixed in 3.4.

Browse source
This commit is contained in:
R David Murray 2014-02-07 13:04:18 -05:00
commit feb68522fd
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/email/message.py
View file

@ -303,8 +303,6 @@ class Message:
""" """
if hasattr(payload, 'encode'): if hasattr(payload, 'encode'):
if charset is None: 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 self._payload = payload
return return
if not isinstance(charset, Charset): if not isinstance(charset, Charset):
@ -352,8 +350,9 @@ class Message:
try: try:
cte(self) cte(self)
except TypeError: except TypeError:
# This if is for backward compatibility and will be removed # This 'if' is for backward compatibility, it allows unicode
# in 3.4 when the ascii check is added to set_payload. # through even though that won't work correctly if the
# message is serialized.
payload = self._payload payload = self._payload
if payload: if payload:
try: try: