summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-04-22 11:57:12 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-04-22 11:57:12 (GMT)
commitc303c12160090f926d9ffc582a85b82803785e4d (patch)
tree2483d0abf140e815d1858bc55a5e37c1f836acbe /Lib
parent5e001f65da88555f1da2a73e9ff49317005b7f42 (diff)
downloadcpython-c303c12160090f926d9ffc582a85b82803785e4d.zip
cpython-c303c12160090f926d9ffc582a85b82803785e4d.tar.gz
cpython-c303c12160090f926d9ffc582a85b82803785e4d.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 0b204e7..2cf1a0a 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -520,10 +520,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