summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-04-22 11:55:07 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-04-22 11:55:07 (GMT)
commitba02025457eca3d186ef205af06b186aca5049a2 (patch)
treecbe4e4260992d1a3e260aa5caac9fa4e2292e9b3 /Lib
parent8ac829209f7b4cc361c3a861960cac2483530839 (diff)
downloadcpython-ba02025457eca3d186ef205af06b186aca5049a2.zip
cpython-ba02025457eca3d186ef205af06b186aca5049a2.tar.gz
cpython-ba02025457eca3d186ef205af06b186aca5049a2.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/email/test/test_email.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 18a1480..e94c07f 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -541,10 +541,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