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

Issue #27445: Merge from 3.5

Browse source
This commit is contained in:
Berker Peksag 2016-09-08 19:42:11 +03:00
commit d8b7770a0e
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/email/mime/text.py
View file

@ -35,10 +35,8 @@ class MIMEText(MIMENonMultipart):
_charset = 'us-ascii'
except UnicodeEncodeError:
_charset = 'utf-8'
if isinstance(_charset, Charset):
_charset = str(_charset)
MIMENonMultipart.__init__(self, 'text', _subtype, policy=policy,
**{'charset': _charset})
**{'charset': str(_charset)})
self.set_payload(_text, _charset)