[Python-checkins] r80354 - in python/branches/release31-maint: Lib/email/test/test_email.py

[ezio.melotti]

Author: ezio.melotti
Date: Thu Apr 22 13:30:51 2010
New Revision: 80354

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/email/test/test_email.py

Modified: python/branches/release31-maint/Lib/email/test/test_email.py
==============================================================================
--- python/branches/release31-maint/Lib/email/test/test_email.py	(original)
+++ python/branches/release31-maint/Lib/email/test/test_email.py	Thu Apr 22 13:30:51 2010
@@ -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')