From: Ezio Melotti Date: Thu, 22 Apr 2010 11:30:51 +0000 (+0000) Subject: Merged revisions 80353 via svnmerge from X-Git-Tag: v3.1.3rc1~893 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba47a371940bc1a1e4bc915e15ac12d9b6535daf;p=python 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. ........ ................ --- diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 2ce2e8c1a7..815ddd30c7 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -514,11 +514,6 @@ class TestEncoders(unittest.TestCase): msg.set_charset('us-ascii') eq(msg['content-transfer-encoding'], '7bit') - 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