commit ba47a371940bc1a1e4bc915e15ac12d9b6535daf
author Ezio Melotti <ezio.melotti@gmail.com> Thu Apr 22 11:30:51 2010 +0000
committer Ezio Melotti <ezio.melotti@gmail.com> Thu Apr 22 11:30:51 2010 +0000
tree 422fb4bdddb83bf5676c07c58267a5d5c7595c89
parent 9b05700ed3e395a87398bfd878bd92e65f682bce

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.
  ........
................

Lib/email/test/test_email.py

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 @@
 
     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')