I'm going to call this superseded just to avoid collision in the key

This commit is contained in:
Benjamin Peterson 2011-03-04 04:58:22 +00:00
parent 3b50e8a321
commit 8740ed3746
10 changed files with 17 additions and 17 deletions

View File

@ -271,7 +271,7 @@ optional and are described below. All other headers are required. ::
Author: <list of authors' real names and optionally, email addrs> Author: <list of authors' real names and optionally, email addrs>
* Discussions-To: <email address> * Discussions-To: <email address>
Status: <Draft | Active | Accepted | Deferred | Rejected | Status: <Draft | Active | Accepted | Deferred | Rejected |
Withdrawn | Final | Replaced> Withdrawn | Final | Superseded>
Type: <Standards Track | Informational | Process> Type: <Standards Track | Informational | Process>
* Content-Type: <text/plain | text/x-rst> * Content-Type: <text/plain | text/x-rst>
* Requires: <pep numbers> * Requires: <pep numbers>
@ -279,7 +279,7 @@ optional and are described below. All other headers are required. ::
* Python-Version: <version number> * Python-Version: <version number>
Post-History: <dates of postings to python-list and python-dev> Post-History: <dates of postings to python-list and python-dev>
* Replaces: <pep number> * Replaces: <pep number>
* Replaced-By: <pep number> * Superseded-By: <pep number>
* Resolution: <url> * Resolution: <url>
The Author header lists the names, and optionally the email addresses The Author header lists the names, and optionally the email addresses
@ -334,9 +334,9 @@ Informational and Process PEPs do not need a Python-Version header.
PEPs may have a Requires header, indicating the PEP numbers that this PEPs may have a Requires header, indicating the PEP numbers that this
PEP depends on. PEP depends on.
PEPs may also have a Replaced-By header indicating that a PEP has been PEPs may also have a Superseded-By header indicating that a PEP has
rendered obsolete by a later document; the value is the number of the been rendered obsolete by a later document; the value is the number of
PEP that replaces the current document. The newer PEP must have a the PEP that replaces the current document. The newer PEP must have a
Replaces header containing the number of the PEP that it rendered Replaces header containing the number of the PEP that it rendered
obsolete. obsolete.

View File

@ -5,11 +5,11 @@ Last-Modified: $Date$
Author: anthony@interlink.com.au (Anthony Baxter), Author: anthony@interlink.com.au (Anthony Baxter),
barry@python.org (Barry Warsaw), barry@python.org (Barry Warsaw),
guido@python.org (Guido van Rossum) guido@python.org (Guido van Rossum)
Status: Replaced Status: Superseded
Type: Informational Type: Informational
Created: 22-Aug-2001 (edited down on 9-Jan-2002 to become PEP 102) Created: 22-Aug-2001 (edited down on 9-Jan-2002 to become PEP 102)
Post-History: Post-History:
Replaced-By: 101 Superseded-By: 101
Replacement Note Replacement Note

View File

@ -3,12 +3,12 @@ Title: String Interpolation
Version: $Revision$ Version: $Revision$
Last-Modified: $Date$ Last-Modified: $Date$
Author: ping@zesty.ca (Ka-Ping Yee) Author: ping@zesty.ca (Ka-Ping Yee)
Status: Rejected Status: Superseded
Type: Standards Track Type: Standards Track
Created: 24-Jul-2000 Created: 24-Jul-2000
Python-Version: 2.1 Python-Version: 2.1
Post-History: Post-History:
Replaced-By: 292 Superseded-By: 292
Abstract Abstract

View File

@ -7,7 +7,7 @@ Status: Rejected
Type: Informational Type: Informational
Created: 31-Jul-2000 Created: 31-Jul-2000
Post-History: Post-History:
Replaced-By: 287 Superseded-By: 287
Notice Notice

View File

@ -8,7 +8,7 @@ Status: Final
Type: Informational Type: Informational
Created: Created:
Post-History: Post-History:
Replaced-By: 249 Superseded-By: 249
Introduction Introduction

View File

@ -9,7 +9,7 @@ Type: Informational
Content-Type: text/x-rst Content-Type: text/x-rst
Created: 07-Dec-2003 Created: 07-Dec-2003
Post-History: 07-Dec-2003, 08-Aug-2004, 20-Aug-2004, 27-Aug-2004, 27-Sep-2010 Post-History: 07-Dec-2003, 08-Aug-2004, 20-Aug-2004, 27-Aug-2004, 27-Sep-2010
Replaced-By: 3333 Superseded-By: 3333
Preface Preface

View File

@ -3,7 +3,7 @@ Title: Exception Chaining and Embedded Tracebacks
Version: $Revision$ Version: $Revision$
Last-Modified: $Date$ Last-Modified: $Date$
Author: Ka-Ping Yee Author: Ka-Ping Yee
Status: Replaced Status: Superseded
Type: Standards Track Type: Standards Track
Content-Type: text/plain Content-Type: text/plain
Created: 12-May-2005 Created: 12-May-2005

View File

@ -4,7 +4,7 @@ Version: $Revision$
Last-Modified: $Date$ Last-Modified: $Date$
Author: Calvin Spealman <ironfroggy@gmail.com>, Author: Calvin Spealman <ironfroggy@gmail.com>,
Tim Delaney <timothy.c.delaney@gmail.com> Tim Delaney <timothy.c.delaney@gmail.com>
Status: Replaced Status: Superseded
Type: Standards Track Type: Standards Track
Content-Type: text/x-rst Content-Type: text/x-rst
Created: 28-Apr-2007 Created: 28-Apr-2007

View File

@ -45,7 +45,7 @@ def sort_peps(peps):
elif pep.status == 'Draft': elif pep.status == 'Draft':
open_.append(pep) open_.append(pep)
elif pep.status in ('Rejected', 'Withdrawn', 'Deferred', elif pep.status in ('Rejected', 'Withdrawn', 'Deferred',
'Incomplete', 'Replaced'): 'Incomplete', 'Superseeded'):
dead.append(pep) dead.append(pep)
elif pep.type_ == 'Informational': elif pep.type_ == 'Informational':
# Hack until the conflict between the use of "Final" # Hack until the conflict between the use of "Final"

View File

@ -160,14 +160,14 @@ class PEP(object):
('Content-Type', False), ('Requires', False), ('Content-Type', False), ('Requires', False),
('Created', True), ('Python-Version', False), ('Created', True), ('Python-Version', False),
('Post-History', False), ('Replaces', False), ('Post-History', False), ('Replaces', False),
('Replaced-By', False), ('Resolution', False), ('Superseded-By', False), ('Resolution', False),
) )
# Valid values for the Type header. # Valid values for the Type header.
type_values = (u"Standards Track", u"Informational", u"Process") type_values = (u"Standards Track", u"Informational", u"Process")
# Valid values for the Status header. # Valid values for the Status header.
# Active PEPs can only be for Informational or Process PEPs. # Active PEPs can only be for Informational or Process PEPs.
status_values = (u"Accepted", u"Rejected", u"Withdrawn", u"Deferred", status_values = (u"Accepted", u"Rejected", u"Withdrawn", u"Deferred",
u"Final", u"Active", u"Draft", u"Replaced") u"Final", u"Active", u"Draft", u"Superseded")
def __init__(self, pep_file): def __init__(self, pep_file):
"""Init object from an open PEP file object.""" """Init object from an open PEP file object."""