summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_email
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-08-10 15:57:52 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-08-10 15:57:52 (GMT)
commita1e639a0f4603b42db60cc21c3ca924ae148dbfd (patch)
treef23f982a5f39551c196eeaacc2022a03a38ad490 /Lib/test/test_email
parent08a1472e65fc0a471924caa406a3b9a6ac755c67 (diff)
parent1c4810b57b78f531f272f550d91d29d99a6dd661 (diff)
downloadcpython-a1e639a0f4603b42db60cc21c3ca924ae148dbfd.zip
cpython-a1e639a0f4603b42db60cc21c3ca924ae148dbfd.tar.gz
cpython-a1e639a0f4603b42db60cc21c3ca924ae148dbfd.tar.bz2
#18505: merge with 3.3.
Diffstat (limited to 'Lib/test/test_email')
-rw-r--r--Lib/test/test_email/test_email.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 3507b1e..b2c8b7d 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -953,7 +953,7 @@ Subject: the first part of this is short,
This is a long line that has two whitespaces in a row. This used to cause
truncation of the header when folded""")
- def test_splitter_split_on_punctuation_only_if_fws(self):
+ def test_splitter_split_on_punctuation_only_if_fws_with_header(self):
eq = self.ndiffAssertEqual
h = Header('thisverylongheaderhas;semicolons;and,commas,but'
'they;arenotlegal;fold,points')
@@ -4241,9 +4241,6 @@ class TestQuopri(unittest.TestCase):
self._test_encode('x' * 200 + '\n',
2 * ('x' * 75 + '=\n') + 'x' * 50 + '\n')
- def test_encode_one_long_line(self):
- self._test_encode('x' * 100 + '\n', 'x' * 75 + '=\n' + 'x' * 25 + '\n')
-
def test_encode_shortest_maxlinelen(self):
self._test_encode('=' * 5, '=3D=\n' * 4 + '=3D', maxlinelen=4)