[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#19563)

[benjamin.peterson]

http://hg.python.org/cpython/rev/a3b61c770b40
changeset:   88138:a3b61c770b40
parent:      88135:d431af9a20e3
parent:      88137:9529c6c993fe
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Dec 22 19:45:53 2013 -0600
summary:
  merge 3.3 (#19563)

files:
  Lib/test/test_email/data/msg_06.txt  |  4 ++--
  Lib/test/test_email/data/msg_08.txt  |  2 +-
  Lib/test/test_email/data/msg_09.txt  |  2 +-
  Lib/test/test_email/data/msg_10.txt  |  2 +-
  Lib/test/test_email/data/msg_12.txt  |  2 +-
  Lib/test/test_email/data/msg_12a.txt |  2 +-
  Tools/i18n/pygettext.py              |  2 +-
  7 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/Lib/test/test_email/data/msg_06.txt b/Lib/test/test_email/data/msg_06.txt
--- a/Lib/test/test_email/data/msg_06.txt
+++ b/Lib/test/test_email/data/msg_06.txt
@@ -5,7 +5,7 @@
 Content-Description: forwarded message
 Content-Transfer-Encoding: 7bit
 Message-ID: <15265.9482.641338.555352 at python.org>
-From: barry at zope.com (Barry A. Warsaw)
+From: barry at python.org (Barry A. Warsaw)
 Sender: barry at python.org
 To: barry at python.org
 Subject: forwarded message from Barry A. Warsaw
@@ -20,7 +20,7 @@
 Return-Path: <barry at python.org>
 Delivered-To: barry at python.org
 Message-ID: <15265.9468.713530.98441 at python.org>
-From: barry at zope.com (Barry A. Warsaw)
+From: barry at python.org (Barry A. Warsaw)
 Sender: barry at python.org
 To: barry at python.org
 Subject: testing
diff --git a/Lib/test/test_email/data/msg_08.txt b/Lib/test/test_email/data/msg_08.txt
--- 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 at zope.com>
+From: Barry Warsaw <barry at python.org>
 To: Dingus Lovers <cravindogs at 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
--- 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 at zope.com>
+From: Barry Warsaw <barry at python.org>
 To: Dingus Lovers <cravindogs at 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
--- 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 at zope.com>
+From: Barry Warsaw <barry at python.org>
 To: Dingus Lovers <cravindogs at 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
--- 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 at zope.com>
+From: Barry Warsaw <barry at python.org>
 To: Dingus Lovers <cravindogs at 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
--- 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 at zope.com>
+From: Barry Warsaw <barry at python.org>
 To: Dingus Lovers <cravindogs at 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
--- 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 at zope.com>
+# Originally written by Barry Warsaw <barry at python.org>
 #
 # Minimally patched to make it even more xgettext compatible
 # by Peter Funk <pf at artcom-gmbh.de>

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