| Index: Lib/email/test/test_email.py |
| =================================================================== |
| --- Lib/email/test/test_email.py (revision 64495) |
| +++ Lib/email/test/test_email.py (working copy) |
| @@ -544,8 +544,8 @@ |
| eq = self.ndiffAssertEqual |
| msg = email.message_from_string("""\ |
| Subject: bug demonstration |
| -\t12345678911234567892123456789312345678941234567895123456789612345678971234567898112345678911234567892123456789112345678911234567892123456789 |
| -\tmore text |
| + 12345678911234567892123456789312345678941234567895123456789612345678971234567898112345678911234567892123456789112345678911234567892123456789 |
| + more text |
| test |
| """) |
| @@ -554,8 +554,8 @@ |
| g.flatten(msg) |
| eq(sfp.getvalue(), """\ |
| Subject: bug demonstration |
| -\t12345678911234567892123456789312345678941234567895123456789612345678971234567898112345678911234567892123456789112345678911234567892123456789 |
| -\tmore text |
| + 12345678911234567892123456789312345678941234567895123456789612345678971234567898112345678911234567892123456789112345678911234567892123456789 |
| + more text |
| test |
| """) |
| @@ -564,8 +564,8 @@ |
| eq = self.ndiffAssertEqual |
| hstr = """\ |
| bug demonstration |
| -\t12345678911234567892123456789312345678941234567895123456789612345678971234567898112345678911234567892123456789112345678911234567892123456789 |
| -\tmore text""" |
| + 12345678911234567892123456789312345678941234567895123456789612345678971234567898112345678911234567892123456789112345678911234567892123456789 |
| + more text""" |
| h = Header(hstr, continuation_ws='\t') |
| eq(h.encode(), """\ |
| bug demonstration |
| @@ -655,7 +655,7 @@ |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| X-Foobar-Spoink-Defrobnit: wasnipoop; giraffes="very-long-necked-animals"; |
| -\tspooge="yummy"; hippos="gargantuan"; marshmallows="gooey" |
| + spooge="yummy"; hippos="gargantuan"; marshmallows="gooey" |
| ''') |
| @@ -671,14 +671,14 @@ |
| eq(sfp.getvalue(), """\ |
| From: test@dom.ain |
| References: <0@dom.ain> <1@dom.ain> <2@dom.ain> <3@dom.ain> <4@dom.ain> |
| -\t<5@dom.ain> <6@dom.ain> <7@dom.ain> <8@dom.ain> <9@dom.ain> |
| + <5@dom.ain> <6@dom.ain> <7@dom.ain> <8@dom.ain> <9@dom.ain> |
| Test""") |
| def test_no_split_long_header(self): |
| eq = self.ndiffAssertEqual |
| hstr = 'References: ' + 'x' * 80 |
| - h = Header(hstr, continuation_ws='\t') |
| + h = Header(hstr) |
| eq(h.encode(), """\ |
| References: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx""") |
| @@ -749,9 +749,9 @@ |
| msg['To'] = to |
| eq(msg.as_string(0), '''\ |
| To: "Someone Test #A" <someone@eecs.umich.edu>, <someone@eecs.umich.edu>, |
| -\t"Someone Test #B" <someone@umich.edu>, |
| -\t"Someone Test #C" <someone@eecs.umich.edu>, |
| -\t"Someone Test #D" <someone@eecs.umich.edu> |
| + "Someone Test #B" <someone@umich.edu>, |
| + "Someone Test #C" <someone@eecs.umich.edu>, |
| + "Someone Test #D" <someone@eecs.umich.edu> |
| ''') |
| @@ -794,22 +794,21 @@ |
| \throthgar.la.mastaler.com (tmda-ofmipd) with ESMTP; |
| \tWed, 05 Mar 2003 18:10:18 -0700 |
| Received-2: from FOO.TLD (vizworld.acl.foo.tld [123.452.678.9]) by |
| -\throthgar.la.mastaler.com (tmda-ofmipd) with ESMTP; |
| -\tWed, 05 Mar 2003 18:10:18 -0700 |
| + hrothgar.la.mastaler.com (tmda-ofmipd) with ESMTP; |
| + Wed, 05 Mar 2003 18:10:18 -0700 |
| """) |
| def test_string_headerinst_eq(self): |
| h = '<15975.17901.207240.414604@sgigritzmann1.mathematik.tu-muenchen.de> (David Bremner\'s message of "Thu, 6 Mar 2003 13:58:21 +0100")' |
| msg = Message() |
| - msg['Received-1'] = Header(h, header_name='Received-1', |
| - continuation_ws='\t') |
| + msg['Received-1'] = Header(h, header_name='Received-1') |
| msg['Received-2'] = h |
| self.assertEqual(msg.as_string(), """\ |
| -Received-1: <15975.17901.207240.414604@sgigritzmann1.mathematik.tu-muenchen.de> |
| -\t(David Bremner's message of "Thu, 6 Mar 2003 13:58:21 +0100") |
| -Received-2: <15975.17901.207240.414604@sgigritzmann1.mathematik.tu-muenchen.de> |
| -\t(David Bremner's message of "Thu, 6 Mar 2003 13:58:21 +0100") |
| +Received-1: <15975.17901.207240.414604@sgigritzmann1.mathematik.tu-muenchen.de> (David |
| + Bremner's message of "Thu, 6 Mar 2003 13:58:21 +0100") |
| +Received-2: <15975.17901.207240.414604@sgigritzmann1.mathematik.tu-muenchen.de> (David |
| + Bremner's message of "Thu, 6 Mar 2003 13:58:21 +0100") |
| """) |
| @@ -823,7 +822,7 @@ |
| msg['Face-2'] = Header(t, header_name='Face-2') |
| eq(msg.as_string(), """\ |
| Face-1: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEUAAAAkHiJeRUIcGBi9 |
| -\tlocQDQ4zJykFBAXJfWDjAAACYUlEQVR4nF2TQY/jIAyFc6lydlG5x8Nyp1Y69wj1PN2I5gzp |
| + locQDQ4zJykFBAXJfWDjAAACYUlEQVR4nF2TQY/jIAyFc6lydlG5x8Nyp1Y69wj1PN2I5gzp |
| Face-2: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAGFBMVEUAAAAkHiJeRUIcGBi9 |
| locQDQ4zJykFBAXJfWDjAAACYUlEQVR4nF2TQY/jIAyFc6lydlG5x8Nyp1Y69wj1PN2I5gzp |
| @@ -837,7 +836,7 @@ |
| msg = email.message_from_string(m) |
| eq(msg.as_string(), '''\ |
| Received: from siimage.com ([172.25.1.3]) by zima.siliconimage.com with |
| -\tMicrosoft SMTPSVC(5.0.2195.4905); Wed, 16 Oct 2002 07:41:11 -0700 |
| + Microsoft SMTPSVC(5.0.2195.4905); Wed, 16 Oct 2002 07:41:11 -0700 |
| ''') |
| @@ -851,7 +850,7 @@ |
| msg['List'] = Header(h, header_name='List') |
| eq(msg.as_string(), """\ |
| List: List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/spamassassin-talk>, |
| -\t<mailto:spamassassin-talk-request@lists.sourceforge.net?subject=unsubscribe> |
| + <mailto:spamassassin-talk-request@lists.sourceforge.net?subject=unsubscribe> |
| List: List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/spamassassin-talk>, |
| <mailto:spamassassin-talk-request@lists.sourceforge.net?subject=unsubscribe> |
| @@ -2983,7 +2982,7 @@ |
| Return-Path: <bbb@zzz.org> |
| Delivered-To: bbb@zzz.org |
| Received: by mail.zzz.org (Postfix, from userid 889) |
| -\tid 27CEAD38CC; Fri, 4 May 2001 14:05:44 -0400 (EDT) |
| + id 27CEAD38CC; Fri, 4 May 2001 14:05:44 -0400 (EDT) |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| Message-ID: <15090.61304.110929.45684@aaa.zzz.org> |
| @@ -2992,7 +2991,7 @@ |
| Subject: This is a test message |
| Date: Fri, 4 May 2001 14:05:44 -0400 |
| Content-Type: text/plain; charset=us-ascii; |
| -\ttitle*="us-ascii'en'This%20is%20even%20more%20%2A%2A%2Afun%2A%2A%2A%20isn%27t%20it%21" |
| + title*="us-ascii'en'This%20is%20even%20more%20%2A%2A%2Afun%2A%2A%2A%20isn%27t%20it%21" |
| Hi, |
| @@ -3013,7 +3012,7 @@ |
| Return-Path: <bbb@zzz.org> |
| Delivered-To: bbb@zzz.org |
| Received: by mail.zzz.org (Postfix, from userid 889) |
| -\tid 27CEAD38CC; Fri, 4 May 2001 14:05:44 -0400 (EDT) |
| + id 27CEAD38CC; Fri, 4 May 2001 14:05:44 -0400 (EDT) |
| MIME-Version: 1.0 |
| Content-Transfer-Encoding: 7bit |
| Message-ID: <15090.61304.110929.45684@aaa.zzz.org> |
| @@ -3022,7 +3021,7 @@ |
| Subject: This is a test message |
| Date: Fri, 4 May 2001 14:05:44 -0400 |
| Content-Type: text/plain; charset="us-ascii"; |
| -\ttitle*="us-ascii'en'This%20is%20even%20more%20%2A%2A%2Afun%2A%2A%2A%20isn%27t%20it%21" |
| + title*="us-ascii'en'This%20is%20even%20more%20%2A%2A%2Afun%2A%2A%2A%20isn%27t%20it%21" |
| Hi, |
