summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-04-22 11:29:27 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-04-22 11:29:27 (GMT)
commit5e001f65da88555f1da2a73e9ff49317005b7f42 (patch)
tree27b031b2d41388c23b845626eac83208bc370004
parent35466c5bcec27fbcdb702f10e2269c6efef978ae (diff)
downloadcpython-5e001f65da88555f1da2a73e9ff49317005b7f42.zip
cpython-5e001f65da88555f1da2a73e9ff49317005b7f42.tar.gz
cpython-5e001f65da88555f1da2a73e9ff49317005b7f42.tar.bz2
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. ........
-rw-r--r--Lib/email/test/test_email.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index cd28206..0b204e7 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -520,11 +520,6 @@ class TestEncoders(unittest.TestCase):
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')