Issue #27445: Merge from 3.5

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

View file

@ -1653,9 +1653,12 @@ class TestMIMEText(unittest.TestCase):
eq(msg.get_charset().input_charset, 'us-ascii')
eq(msg['content-type'], 'text/plain; charset="us-ascii"')
# Also accept a Charset instance
msg = MIMEText('hello there', _charset=Charset('utf-8'))
charset = Charset('utf-8')
charset.body_encoding = None
msg = MIMEText('hello there', _charset=charset)
eq(msg.get_charset().input_charset, 'utf-8')
eq(msg['content-type'], 'text/plain; charset="utf-8"')
eq(msg.get_payload(), 'hello there')
def test_7bit_input(self):
eq = self.assertEqual