diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-12-23 01:45:53 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-12-23 01:45:53 (GMT) |
| commit | 8fb007f3299039f27937ef72c073192a76f29743 (patch) | |
| tree | a3123da79331375f736e548076c588fc7b86e7c6 /Lib | |
| parent | a93ca971a504678d18bae1b46b8cff528a8f562c (diff) | |
| parent | eaedaeccf275d5e8cb3443c50323e57dee60a204 (diff) | |
| download | cpython-8fb007f3299039f27937ef72c073192a76f29743.zip cpython-8fb007f3299039f27937ef72c073192a76f29743.tar.gz cpython-8fb007f3299039f27937ef72c073192a76f29743.tar.bz2 | |
merge 3.3 (#19563)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_email/data/msg_06.txt | 4 | ||||
| -rw-r--r-- | Lib/test/test_email/data/msg_08.txt | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/data/msg_09.txt | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/data/msg_10.txt | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/data/msg_12.txt | 2 | ||||
| -rw-r--r-- | Lib/test/test_email/data/msg_12a.txt | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/test_email/data/msg_06.txt b/Lib/test/test_email/data/msg_06.txt index 69f3a47..f51ac96 100644 --- a/Lib/test/test_email/data/msg_06.txt +++ b/Lib/test/test_email/data/msg_06.txt @@ -5,7 +5,7 @@ Content-Type: message/rfc822 Content-Description: forwarded message Content-Transfer-Encoding: 7bit Message-ID: <15265.9482.641338.555352@python.org> -From: barry@zope.com (Barry A. Warsaw) +From: barry@python.org (Barry A. Warsaw) Sender: barry@python.org To: barry@python.org Subject: forwarded message from Barry A. Warsaw @@ -20,7 +20,7 @@ Content-Type: text/plain; charset=us-ascii Return-Path: <barry@python.org> Delivered-To: barry@python.org Message-ID: <15265.9468.713530.98441@python.org> -From: barry@zope.com (Barry A. Warsaw) +From: barry@python.org (Barry A. Warsaw) Sender: barry@python.org To: barry@python.org Subject: testing diff --git a/Lib/test/test_email/data/msg_08.txt b/Lib/test/test_email/data/msg_08.txt index b563083..132ce7a 100644 --- a/Lib/test/test_email/data/msg_08.txt +++ b/Lib/test/test_email/data/msg_08.txt @@ -1,5 +1,5 @@ MIME-Version: 1.0 -From: Barry Warsaw <barry@zope.com> +From: Barry Warsaw <barry@python.org> To: Dingus Lovers <cravindogs@cravindogs.com> Subject: Lyrics Date: Fri, 20 Apr 2001 19:35:02 -0400 diff --git a/Lib/test/test_email/data/msg_09.txt b/Lib/test/test_email/data/msg_09.txt index 575c4c2..0cfa6ba 100644 --- a/Lib/test/test_email/data/msg_09.txt +++ b/Lib/test/test_email/data/msg_09.txt @@ -1,5 +1,5 @@ MIME-Version: 1.0 -From: Barry Warsaw <barry@zope.com> +From: Barry Warsaw <barry@python.org> To: Dingus Lovers <cravindogs@cravindogs.com> Subject: Lyrics Date: Fri, 20 Apr 2001 19:35:02 -0400 diff --git a/Lib/test/test_email/data/msg_10.txt b/Lib/test/test_email/data/msg_10.txt index 0790396..d49e477 100644 --- a/Lib/test/test_email/data/msg_10.txt +++ b/Lib/test/test_email/data/msg_10.txt @@ -1,5 +1,5 @@ MIME-Version: 1.0 -From: Barry Warsaw <barry@zope.com> +From: Barry Warsaw <barry@python.org> To: Dingus Lovers <cravindogs@cravindogs.com> Subject: Lyrics Date: Fri, 20 Apr 2001 19:35:02 -0400 diff --git a/Lib/test/test_email/data/msg_12.txt b/Lib/test/test_email/data/msg_12.txt index 4bec8d9..b109b98 100644 --- a/Lib/test/test_email/data/msg_12.txt +++ b/Lib/test/test_email/data/msg_12.txt @@ -1,5 +1,5 @@ MIME-Version: 1.0 -From: Barry Warsaw <barry@zope.com> +From: Barry Warsaw <barry@python.org> To: Dingus Lovers <cravindogs@cravindogs.com> Subject: Lyrics Date: Fri, 20 Apr 2001 19:35:02 -0400 diff --git a/Lib/test/test_email/data/msg_12a.txt b/Lib/test/test_email/data/msg_12a.txt index e94224e..2092aa0 100644 --- a/Lib/test/test_email/data/msg_12a.txt +++ b/Lib/test/test_email/data/msg_12a.txt @@ -1,5 +1,5 @@ MIME-Version: 1.0 -From: Barry Warsaw <barry@zope.com> +From: Barry Warsaw <barry@python.org> To: Dingus Lovers <cravindogs@cravindogs.com> Subject: Lyrics Date: Fri, 20 Apr 2001 19:35:02 -0400 |