From c17318a601371316e418382a5079f43e9567576e Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Tue, 18 Jan 2011 13:56:16 +0000 Subject: [PATCH] Tidy up the Meta-PEP and Info PEP sections of PEP 0 by moving purely historical entries after the list of Finished PEPs --- pep-0347.txt | 12 ++++++------ pep-0361.txt | 8 ++++---- pep-3003.txt | 6 +++--- pep0/output.py | 26 ++++++++++++++++++++++---- 4 files changed, 35 insertions(+), 17 deletions(-) diff --git a/pep-0347.txt b/pep-0347.txt index aab5cff20..59099edc1 100644 --- a/pep-0347.txt +++ b/pep-0347.txt @@ -4,7 +4,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Martin von Löwis Discussions-To: -Status: Accepted +Status: Final Type: Process Content-Type: text/x-rst Created: 14-Jul-2004 @@ -101,7 +101,7 @@ attributes in the authorized_keys files. The lines in the authorized_keys file should read like this (wrapped for better readability):: - command="/usr/bin/svnserve --root=/svnroot -t + command="/usr/bin/svnserve --root=/svnroot -t --tunnel-user=''",no-port-forwarding, no-X11-forwarding,no-agent-forwarding,no-pty ssh-dss @@ -213,7 +213,7 @@ Publish the Repository The repository should be published at http://svn.python.org/projects. Read-write access should be granted to all current SF committers -through svn+ssh://pythondev@svn.python.org/; +through svn+ssh://pythondev@svn.python.org/; read-only anonymous access through WebDAV should also be granted. @@ -221,7 +221,7 @@ As an option, websvn (available e.g. from the Debian websvn package) could be provided. Unfortunately, in the test installation, websvn breaks because it runs out of memory. -The current SF project admins should get write access to the +The current SF project admins should get write access to the authorized_keys2 file of the pythondev account. @@ -258,7 +258,7 @@ The rejected alternatives are shortly discussed here: to the additional workload; migrating the repository again if they get overworked is an option. -- Different authentication strategies were discussed. As +- Different authentication strategies were discussed. As alternatives to svn+ssh were suggested * Subversion over WebDAV, using SSL and basic authentication, @@ -309,7 +309,7 @@ Copyright This document has been placed in the public domain. - + .. Local Variables: mode: indented-text diff --git a/pep-0361.txt b/pep-0361.txt index ec3fb9c53..f8bdf7465 100644 --- a/pep-0361.txt +++ b/pep-0361.txt @@ -3,7 +3,7 @@ Title: Python 2.6 and 3.0 Release Schedule Version: $Revision$ Last-Modified: $Date$ Author: Neal Norwitz, Barry Warsaw -Status: Active +Status: Final Type: Informational Created: 29-June-2006 Python-Version: 2.6 and 3.0 @@ -146,7 +146,7 @@ Possible features for 2.6 The following PEPs are being worked on for inclusion in 2.6: None. - Each non-trivial feature listed here that is not a PEP must be + Each non-trivial feature listed here that is not a PEP must be discussed on python-dev. Other enhancements include: - distutils replacement (requires a PEP) @@ -163,7 +163,7 @@ Possible features for 2.6 PJE's withdrawal from 2.5 for inclusion in 2.6: http://mail.python.org/pipermail/python-dev/2006-April/064145.html - + Modules to gain a DeprecationWarning (as specified for Python 2.6 or through negligence): @@ -269,7 +269,7 @@ Copyright This document has been placed in the public domain. - + Local Variables: mode: indented-text indent-tabs-mode: nil diff --git a/pep-3003.txt b/pep-3003.txt index 6fe51d9bf..acb11e627 100644 --- a/pep-3003.txt +++ b/pep-3003.txt @@ -3,7 +3,7 @@ Title: Python Language Moratorium Version: $Revision$ Last-Modified: $Date$ Author: Brett Cannon, Jesse Noller, Guido van Rossum -Status: Accepted +Status: Active Type: Process Content-Type: text/x-rst Created: 21-Oct-2009 @@ -97,7 +97,7 @@ Case-by-Case Exemptions * New methods on built-ins The case for adding a method to a built-in object can be made. -* Incorrect language semantics +* Incorrect language semantics If the language semantics turn out to be ambiguous or improperly implemented based on the intention of the original design then the semantics may change. @@ -156,7 +156,7 @@ References .. [4] http://codespeak.net/pypy/ .. [5] http://code.google.com/p/unladen-swallow/ - + .. Local Variables: mode: indented-text diff --git a/pep0/output.py b/pep0/output.py index 4658311c7..4ed6a38c1 100644 --- a/pep0/output.py +++ b/pep0/output.py @@ -30,19 +30,32 @@ def sort_peps(peps): accepted = [] open_ = [] finished = [] + historical = [] dead = [] for pep in peps: # Order of 'if' statement important. Key Status values take precedence # over Type value, and vice-versa. if pep.type_ == 'Process': - meta.append(pep) + if pep.status in ("Active", "Draft"): + meta.append(pep) + elif pep.status in ("Withdrawn", "Rejected"): + dead.append(pep) + else: + historical.append(pep) elif pep.status == 'Draft': open_.append(pep) elif pep.status in ('Rejected', 'Withdrawn', 'Deferred', 'Incomplete', 'Replaced'): dead.append(pep) elif pep.type_ == 'Informational': - info.append(pep) + # Hack until the conflict between the use of "Final" + # for both API definition PEPs and other (actually + # obsolete) PEPs is addressed + if (pep.status == "Active" or + "Release Schedule" not in pep.title): + info.append(pep) + else: + historical.append(pep) elif pep.status in ('Accepted', 'Active'): accepted.append(pep) elif pep.status == 'Final': @@ -51,7 +64,7 @@ def sort_peps(peps): raise PEPError("unsorted (%s/%s)" % (pep.type_, pep.status), pep.filename, pep.number) - return meta, info, accepted, open_, finished, dead + return meta, info, accepted, open_, finished, historical, dead def verify_email_addresses(peps): @@ -109,7 +122,7 @@ def write_pep0(peps, output=sys.stdout): print>>output, u"Index by Category" print>>output write_column_headers(output) - meta, info, accepted, open_, finished, dead = sort_peps(peps) + meta, info, accepted, open_, finished, historical, dead = sort_peps(peps) print>>output print>>output, u" Meta-PEPs (PEPs about PEPs or Processes)" print>>output @@ -136,6 +149,11 @@ def write_pep0(peps, output=sys.stdout): for pep in finished: print>>output, unicode(pep) print>>output + print>>output, u" Historical Meta-PEPs and Informational PEPs" + print>>output + for pep in historical: + print>>output, unicode(pep) + print>>output print>>output, u" Deferred, Abandoned, Withdrawn, and Rejected PEPs" print>>output for pep in dead: