From c30bb7d5ca3a7fa60f5dd7e078f76a8352d2d131 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Thu, 22 Apr 2010 11:58:06 +0000 Subject: Merged revisions 80359 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80359 | ezio.melotti | 2010-04-22 14:57:12 +0300 (Thu, 22 Apr 2010) | 9 lines Merged revisions 80357 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80357 | ezio.melotti | 2010-04-22 14:53:21 +0300 (Thu, 22 Apr 2010) | 1 line Rephrase comment. ........ ................ --- Lib/email/test/test_email.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 815ddd3..1f257c7 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -516,10 +516,10 @@ class TestEncoders(unittest.TestCase): def test_default_cte(self): eq = self.assertEqual - # With no explicit _charset its us-ascii, and all are 7-bit + # 7bit data and the default us-ascii _charset msg = MIMEText('hello world') eq(msg['content-transfer-encoding'], '7bit') - # Similar, but with 8-bit data + # Similar, but with 8bit data msg = MIMEText('hello \xf8 world') eq(msg['content-transfer-encoding'], '8bit') # And now with a different charset -- cgit v0.12