diff --git a/pep-0361.txt b/pep-0361.txt index 2f5e05536..f172e0ff1 100644 --- a/pep-0361.txt +++ b/pep-0361.txt @@ -248,10 +248,10 @@ References http://www.python.org/dev/peps/pep-3100 .. [#pep3112] PEP 3112 (Bytes literals in Python 3000) - http://www.python.org/dev/peps/pep-03112 + http://www.python.org/dev/peps/pep-3112 .. [#pep3127] PEP 3127 (Integer Literal Support and Syntax) - http://www.python.org/dev/peps/pep-03127 + http://www.python.org/dev/peps/pep-3127 Copyright diff --git a/pep-3000.txt b/pep-3000.txt index d75384955..dd7eda483 100644 --- a/pep-3000.txt +++ b/pep-3000.txt @@ -48,23 +48,11 @@ Python 3000 before we started the Python 3000 process for real. PEP Timeline ======== -Past deadlines: - -* April 2007: feature PEPs submitted (except library reform proposals). - -Hopeful future deadlines: - -* August 2007: release 3.0a1. -* December 2007: release 3.0a2. -* Early 2008 (pre-PyCon): release 2.6a1. -* May 2008 (post-PyCon): full feature freeze for 3.0 and 2.6. -* July 2008: release 2.6 (final). -* August 2008: release 3.0 (final). - -See PEP 361 for more details on the Python 2.6 release schedule. +See PEP 361 [#pep361], which contains the release schedule for Python +2.6 and 3.0. These versions will be released in lockstep. Note: standard library development is expected to ramp up after 3.0a1 -is released; it is exempt from the April 2007 PEP deadline. +is released. I expect that there will be parallel Python 2.x and 3.x releases for some time; the Python 2.x releases will continue for a longer time @@ -161,6 +149,9 @@ References .. [2] Joel on Software: Things You Should Never Do, Part I http://www.joelonsoftware.com/articles/fog0000000069.html +.. [#pep361] PEP 361 (Python 2.6 and 3.0 Release Schedule) + http://www.python.org/dev/peps/pep-0361 + Copyright =========