From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Dec 2013 01:45:38 +0000 (-0600)
Subject: update Barry's email (#19563)
X-Git-Tag: v3.4.0b2~126^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eaedaeccf275d5e8cb3443c50323e57dee60a204;p=thirdparty%2FPython%2Fcpython.git

update Barry's email (#19563)
---

diff --git a/Lib/test/test_email/data/msg_06.txt b/Lib/test/test_email/data/msg_06.txt
index 69f3a47ff429..f51ac96114bd 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 b5630836c54a..132ce7ada9bf 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 575c4c205a16..0cfa6bab2baf 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 07903960f9fe..d49e477a818d 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 4bec8d944498..b109b985c8b7 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 e94224ecfe5e..2092aa0c351b 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
diff --git a/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py
index 79d976bc01fe..9ffeb17d6b12 100755
--- 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>