[Python-checkins] r88095 - in peps/trunk: pep-0347.txt pep-0361.txt pep-3003.txt pep0/output.py

nick.coghlan python-checkins at python.org
Tue Jan 18 14:56:17 CET 2011


Author: nick.coghlan
Date: Tue Jan 18 14:56:16 2011
New Revision: 88095

Log:
Tidy up the Meta-PEP and Info PEP sections of PEP 0 by moving purely historical entries after the list of Finished PEPs

Modified:
   peps/trunk/pep-0347.txt
   peps/trunk/pep-0361.txt
   peps/trunk/pep-3003.txt
   peps/trunk/pep0/output.py

Modified: peps/trunk/pep-0347.txt
==============================================================================
--- peps/trunk/pep-0347.txt	(original)
+++ peps/trunk/pep-0347.txt	Tue Jan 18 14:56:16 2011
@@ -4,7 +4,7 @@
 Last-Modified: $Date$
 Author: Martin von Löwis <martin at v.loewis.de>
 Discussions-To: <python-dev at python.org>
-Status: Accepted
+Status: Final
 Type: Process
 Content-Type: text/x-rst
 Created: 14-Jul-2004
@@ -101,7 +101,7 @@
 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='<username>'",no-port-forwarding,
   no-X11-forwarding,no-agent-forwarding,no-pty
   ssh-dss <key> <comment>
@@ -213,7 +213,7 @@
 
 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 @@
 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 @@
   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 @@
 
 This document has been placed in the public domain.
 
-
+
 ..
    Local Variables:
    mode: indented-text

Modified: peps/trunk/pep-0361.txt
==============================================================================
--- peps/trunk/pep-0361.txt	(original)
+++ peps/trunk/pep-0361.txt	Tue Jan 18 14:56:16 2011
@@ -3,7 +3,7 @@
 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 @@
 
     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 @@
 
           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 @@
     This document has been placed in the public domain.
 
 
-
+
 Local Variables:
 mode: indented-text
 indent-tabs-mode: nil

Modified: peps/trunk/pep-3003.txt
==============================================================================
--- peps/trunk/pep-3003.txt	(original)
+++ peps/trunk/pep-3003.txt	Tue Jan 18 14:56:16 2011
@@ -3,7 +3,7 @@
 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 @@
 
 * 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 @@
 .. [4] http://codespeak.net/pypy/
 .. [5] http://code.google.com/p/unladen-swallow/
 
-
+
 ..
    Local Variables:
    mode: indented-text

Modified: peps/trunk/pep0/output.py
==============================================================================
--- peps/trunk/pep0/output.py	(original)
+++ peps/trunk/pep0/output.py	Tue Jan 18 14:56:16 2011
@@ -30,19 +30,32 @@
     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 @@
             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 @@
     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 @@
     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:


More information about the Python-checkins mailing list