languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-16 02:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge 3.3 (#19563)

Browse source
This commit is contained in:
Benjamin Peterson 2013-12-22 19:45:53 -06:00
parent a93ca971a5 eaedaeccf2
commit 8fb007f329
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_email/data/msg_06.txt
View file

@ -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

2
Lib/test/test_email/data/msg_08.txt
View file

@ -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

2
Lib/test/test_email/data/msg_09.txt
View file

@ -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

2
Lib/test/test_email/data/msg_10.txt
View file

@ -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

2
Lib/test/test_email/data/msg_12.txt
View file

@ -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

2
Lib/test/test_email/data/msg_12a.txt
View file

@ -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

2
Tools/i18n/pygettext.py
View file

@ -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>