From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 22 Apr 2010 11:26:43 +0000 (+0000)
Subject: Merged revisions 80350 via svnmerge from
X-Git-Tag: v2.6.6rc1~418
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ac829209f7b4cc361c3a861960cac2483530839;p=thirdparty%2FPython%2Fcpython.git

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 duplicated test in test_email.
........
---

diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 7c15a7cfe874..18a1480dbfe1 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -539,11 +539,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