merge 3.3 (#19563)
This commit is contained in:
commit
8fb007f329
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue