mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Patch #1449244: Support Unicode strings in

Browse source 
email.message.Message.{set_charset,get_content_charset}.
Will backport.
This commit is contained in:
Martin v. Löwis 2007-03-13 10:24:00 +00:00
parent 18c47f6a3b
commit bdd0f39de5
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/email/message.py
View file

@ -238,7 +238,7 @@ class Message:
self.del_param('charset')
self._charset = None
return
if isinstance(charset, str):
if isinstance(charset, basestring):
charset = email.charset.Charset(charset)
if not isinstance(charset, email.charset.Charset):
raise TypeError(charset)
@ -756,7 +756,9 @@ class Message:
charset = charset[2]
# charset character must be in us-ascii range
try:
charset = unicode(charset, 'us-ascii').encode('us-ascii')
if isinstance(charset, str):
charset = unicode(charset, 'us-ascii')
charset = charset.encode('us-ascii')
except UnicodeError:
return failobj
# RFC 2046, $4.1.2 says charsets are not case sensitive