From 8740ed374690706f4240b4637977e0f85bc55521 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 4 Mar 2011 04:58:22 +0000 Subject: [PATCH] I'm going to call this superseded just to avoid collision in the key --- pep-0001.txt | 10 +++++----- pep-0102.txt | 4 ++-- pep-0215.txt | 4 ++-- pep-0216.txt | 2 +- pep-0248.txt | 2 +- pep-0333.txt | 2 +- pep-0344.txt | 2 +- pep-0367.txt | 2 +- pep0/output.py | 2 +- pep0/pep.py | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pep-0001.txt b/pep-0001.txt index 4a81fa0e1..0ebaaa8f2 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -271,7 +271,7 @@ optional and are described below. All other headers are required. :: Author: * Discussions-To: Status: + Withdrawn | Final | Superseded> Type: * Content-Type: * Requires: @@ -279,7 +279,7 @@ optional and are described below. All other headers are required. :: * Python-Version: Post-History: * Replaces: - * Replaced-By: + * Superseded-By: * Resolution: 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 PEP depends on. -PEPs may also have a Replaced-By header indicating that a PEP has been -rendered obsolete by a later document; the value is the number of the -PEP that replaces the current document. The newer PEP must have a +PEPs may also have a Superseded-By header indicating that a PEP has +been rendered obsolete by a later document; the value is the number of +the PEP that replaces the current document. The newer PEP must have a Replaces header containing the number of the PEP that it rendered obsolete. diff --git a/pep-0102.txt b/pep-0102.txt index 0f6141913..b24a29046 100644 --- a/pep-0102.txt +++ b/pep-0102.txt @@ -5,11 +5,11 @@ Last-Modified: $Date$ Author: anthony@interlink.com.au (Anthony Baxter), barry@python.org (Barry Warsaw), guido@python.org (Guido van Rossum) -Status: Replaced +Status: Superseded Type: Informational Created: 22-Aug-2001 (edited down on 9-Jan-2002 to become PEP 102) Post-History: -Replaced-By: 101 +Superseded-By: 101 Replacement Note diff --git a/pep-0215.txt b/pep-0215.txt index fe7fe0413..6bc2779f6 100644 --- a/pep-0215.txt +++ b/pep-0215.txt @@ -3,12 +3,12 @@ Title: String Interpolation Version: $Revision$ Last-Modified: $Date$ Author: ping@zesty.ca (Ka-Ping Yee) -Status: Rejected +Status: Superseded Type: Standards Track Created: 24-Jul-2000 Python-Version: 2.1 Post-History: -Replaced-By: 292 +Superseded-By: 292 Abstract diff --git a/pep-0216.txt b/pep-0216.txt index 4eb9c5bf3..9233e6cbd 100644 --- a/pep-0216.txt +++ b/pep-0216.txt @@ -7,7 +7,7 @@ Status: Rejected Type: Informational Created: 31-Jul-2000 Post-History: -Replaced-By: 287 +Superseded-By: 287 Notice diff --git a/pep-0248.txt b/pep-0248.txt index e6d97645d..ed9651f32 100644 --- a/pep-0248.txt +++ b/pep-0248.txt @@ -8,7 +8,7 @@ Status: Final Type: Informational Created: Post-History: -Replaced-By: 249 +Superseded-By: 249 Introduction diff --git a/pep-0333.txt b/pep-0333.txt index e96038329..5e4f2f20f 100644 --- a/pep-0333.txt +++ b/pep-0333.txt @@ -9,7 +9,7 @@ Type: Informational Content-Type: text/x-rst Created: 07-Dec-2003 Post-History: 07-Dec-2003, 08-Aug-2004, 20-Aug-2004, 27-Aug-2004, 27-Sep-2010 -Replaced-By: 3333 +Superseded-By: 3333 Preface diff --git a/pep-0344.txt b/pep-0344.txt index 044a615f4..5fe18fc5d 100644 --- a/pep-0344.txt +++ b/pep-0344.txt @@ -3,7 +3,7 @@ Title: Exception Chaining and Embedded Tracebacks Version: $Revision$ Last-Modified: $Date$ Author: Ka-Ping Yee -Status: Replaced +Status: Superseded Type: Standards Track Content-Type: text/plain Created: 12-May-2005 diff --git a/pep-0367.txt b/pep-0367.txt index ab1ebe332..c55b36b93 100644 --- a/pep-0367.txt +++ b/pep-0367.txt @@ -4,7 +4,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Calvin Spealman , Tim Delaney -Status: Replaced +Status: Superseded Type: Standards Track Content-Type: text/x-rst Created: 28-Apr-2007 diff --git a/pep0/output.py b/pep0/output.py index 4ed6a38c1..1d5a1d1e3 100644 --- a/pep0/output.py +++ b/pep0/output.py @@ -45,7 +45,7 @@ def sort_peps(peps): elif pep.status == 'Draft': open_.append(pep) elif pep.status in ('Rejected', 'Withdrawn', 'Deferred', - 'Incomplete', 'Replaced'): + 'Incomplete', 'Superseeded'): dead.append(pep) elif pep.type_ == 'Informational': # Hack until the conflict between the use of "Final" diff --git a/pep0/pep.py b/pep0/pep.py index df4ca9066..f588dbd30 100644 --- a/pep0/pep.py +++ b/pep0/pep.py @@ -160,14 +160,14 @@ class PEP(object): ('Content-Type', False), ('Requires', False), ('Created', True), ('Python-Version', False), ('Post-History', False), ('Replaces', False), - ('Replaced-By', False), ('Resolution', False), + ('Superseded-By', False), ('Resolution', False), ) # Valid values for the Type header. type_values = (u"Standards Track", u"Informational", u"Process") # Valid values for the Status header. # Active PEPs can only be for Informational or Process PEPs. 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): """Init object from an open PEP file object."""