[Python-checkins] r80353 - in python/branches/py3k: Lib/email/test/test_email.py

[ezio.melotti]

Author: ezio.melotti
Date: Thu Apr 22 13:29:27 2010
New Revision: 80353

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/email/test/test_email.py

Modified: python/branches/py3k/Lib/email/test/test_email.py
==============================================================================
--- python/branches/py3k/Lib/email/test/test_email.py	(original)
+++ python/branches/py3k/Lib/email/test/test_email.py	Thu Apr 22 13:29:27 2010
@@ -520,11 +520,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')