update Barry's email (#19563)

benjaminp · benjaminp · commit eaedaeccf275 · 2013-12-22T19:45:38.000-06:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python3
 # -*- coding: iso-8859-1 -*-
-# Originally written by Barry Warsaw <barry@zope.com>
+# Originally written by Barry Warsaw <barry@python.org>
 #
 # Minimally patched to make it even more xgettext compatible
 # by Peter Funk <pf@artcom-gmbh.de>

-Original file line number
+Diff line change
 Content-Description: forwarded message
 Content-Transfer-Encoding: 7bit
 Message-ID: <[email protected]>
 -From: barry@zope.com (Barry A. Warsaw)
 +From: barry@python.org (Barry A. Warsaw)
 Sender: [email protected]
 To: [email protected]
 Subject: forwarded message from Barry A. Warsaw
 Return-Path: <[email protected]>
 Delivered-To: [email protected]
 Message-ID: <[email protected]>
 -From: barry@zope.com (Barry A. Warsaw)
 +From: barry@python.org (Barry A. Warsaw)
 Sender: [email protected]
 To: [email protected]
 Subject: testing
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#! /usr/bin/env python3`
`2`	`2`	`# -- coding: iso-8859-1 --`
`3`		`-# Originally written by Barry Warsaw <barry@zope.com>`
	`3`	`+# Originally written by Barry Warsaw <barry@python.org>`
`4`	`4`	`#`
`5`	`5`	`# Minimally patched to make it even more xgettext compatible`
`6`	`6`	`# by Peter Funk <[email protected]>`