diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-04-22 11:30:51 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-04-22 11:30:51 (GMT) |
commit | ba47a371940bc1a1e4bc915e15ac12d9b6535daf (patch) | |
tree | 422fb4bdddb83bf5676c07c58267a5d5c7595c89 /Lib/email | |
parent | 9b05700ed3e395a87398bfd878bd92e65f682bce (diff) | |
download | cpython-ba47a371940bc1a1e4bc915e15ac12d9b6535daf.zip cpython-ba47a371940bc1a1e4bc915e15ac12d9b6535daf.tar.gz cpython-ba47a371940bc1a1e4bc915e15ac12d9b6535daf.tar.bz2 |
Merged revisions 80353 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80353 | ezio.melotti | 2010-04-22 14:29:27 +0300 (Thu, 22 Apr 2010) | 9 lines
Merged revisions 80350 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80350 | ezio.melotti | 2010-04-22 14:23:31 +0300 (Thu, 22 Apr 2010) | 1 line
#8474: fix duplicate test in test_email.
........
................
Diffstat (limited to 'Lib/email')
-rw-r--r-- | Lib/email/test/test_email.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 2ce2e8c..815ddd3 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -516,11 +516,6 @@ class TestEncoders(unittest.TestCase): def test_default_cte(self): eq = self.assertEqual - msg = MIMEText('hello world') - eq(msg['content-transfer-encoding'], '7bit') - - def test_default_cte(self): - eq = self.assertEqual # With no explicit _charset its us-ascii, and all are 7-bit msg = MIMEText('hello world') eq(msg['content-transfer-encoding'], '7bit') |