[Python-checkins] cpython (merge 3.3 -> default): #18505: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/cb0fba5c7828
changeset:   85095:cb0fba5c7828
parent:      85093:40ef5ce25d08
parent:      85094:53d54503fc06
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Aug 10 18:57:52 2013 +0300
summary:
  #18505: merge with 3.3.

files:
  Lib/test/test_email/test_email.py |  5 +----
  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
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -953,7 +953,7 @@
 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 @@
         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)
 

-- 
Repository URL: http://hg.python.org/cpython