Prep for Python 3.1!

Doc/license.rst

@@ -90,7 +90,7 @@ been GPL-compatible; the table below summarizes the various releases.
 +----------------+--------------+------------+------------+-----------------+
 | 2.6            | 2.5          | 2008       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
-| 3.0            | 2.6          | 2007       | PSF        | yes             |
+| 3.0            | 2.6          | 2008       | PSF        | yes             |
 +----------------+--------------+------------+------------+-----------------+
 
 .. note::

Doc/tutorial/interpreter.rst

@@ -10,11 +10,11 @@ Using the Python Interpreter
 Invoking the Interpreter
 ========================
 
-The Python interpreter is usually installed as :file:`/usr/local/bin/python3.0`
+The Python interpreter is usually installed as :file:`/usr/local/bin/python3.1`
 on those machines where it is available; putting :file:`/usr/local/bin` in your
 Unix shell's search path makes it possible to start it by typing the command ::
 
-   python3.0
+   python3.1
 
 to the shell. [#]_ Since the choice of the directory where the interpreter lives
 is an installation option, other places are possible; check with your local
@@ -22,11 +22,11 @@ Python guru or system administrator.  (E.g., :file:`/usr/local/python` is a
 popular alternative location.)
 
 On Windows machines, the Python installation is usually placed in
-:file:`C:\\Python30`, though you can change this when you're running the
+:file:`C:\\Python31`, though you can change this when you're running the
 installer.  To add this directory to your path,  you can type the following
 command into the command prompt in a DOS box::
 
-   set path=%path%;C:\python30
+   set path=%path%;C:\python31
 
 Typing an end-of-file character (:kbd:`Control-D` on Unix, :kbd:`Control-Z` on
 Windows) at the primary prompt causes the interpreter to exit with a zero exit
@@ -101,13 +101,13 @@ with the *secondary prompt*, by default three dots (``...``). The interpreter
 prints a welcome message stating its version number and a copyright notice
 before printing the first prompt::
 
-   $ python3.0
-   Python 3.0a1 (py3k, Sep 12 2007, 12:21:02)
+   $ python3.1
+   Python 3.1a1 (py3k, Sep 12 2007, 12:21:02)
    [GCC 3.4.6 20060404 (Red Hat 3.4.6-8)] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
    >>>
 
-.. XXX update for final release of Python 3.0
+.. XXX update for final release of Python 3.1
 
 Continuation lines are needed when entering a multi-line construct. As an
 example, take a look at this :keyword:`if` statement::
@@ -155,7 +155,7 @@ Executable Python Scripts
 On BSD'ish Unix systems, Python scripts can be made directly executable, like
 shell scripts, by putting the line ::
 
-   #! /usr/bin/env python3.0
+   #! /usr/bin/env python3.1
 
 (assuming that the interpreter is on the user's :envvar:`PATH`) at the beginning
 of the script and giving the file an executable mode.  The ``#!`` must be the
@@ -243,7 +243,7 @@ in the script::
 
 .. rubric:: Footnotes
 
-.. [#] On Unix, the 3.0 interpreter is by default not installed with the
+.. [#] On Unix, the 3.1 interpreter is by default not installed with the
    executable named ``python``, so that it does not conflict with a
    simultaneously installed Python 2.x executable.
 

Doc/tutorial/stdlib.rst

@@ -17,7 +17,7 @@ operating system::
    >>> os.system('time 0:02')
    0
    >>> os.getcwd()      # Return the current working directory
-   'C:\\Python30'
+   'C:\\Python31'
    >>> os.chdir('/server/accesslogs')
 
 Be sure to use the ``import os`` style instead of ``from os import *``.  This

Doc/tutorial/stdlib2.rst

@@ -271,7 +271,7 @@ applications include caching objects that are expensive to create::
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
        d['primary']                # entry was automatically removed
-     File "C:/python30/lib/weakref.py", line 46, in __getitem__
+     File "C:/python31/lib/weakref.py", line 46, in __getitem__
        o = self.data[key]()
    KeyError: 'primary'
 

Include/patchlevel.h

@@ -17,13 +17,13 @@
 /* Version parsed out into numeric values */
 /*--start constants--*/
 #define PY_MAJOR_VERSION	3
-#define PY_MINOR_VERSION	0
+#define PY_MINOR_VERSION	1
 #define PY_MICRO_VERSION	0
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL	3
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_ALPHA
+#define PY_RELEASE_SERIAL	0
 
 /* Version as a string */
-#define PY_VERSION      	"3.0rc3+"
+#define PY_VERSION      	"3.1a0"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository) */

LICENSE

@@ -56,7 +56,7 @@ the various releases.
     2.5             2.4         2006        PSF         yes
     2.5.1           2.5         2007        PSF         yes
     2.6             2.5         2008        PSF         yes
-    3.0             2.6         2007        PSF         yes
+    3.0             2.6         2008        PSF         yes
 
 Footnotes:
 

Lib/distutils/__init__.py

@@ -20,5 +20,5 @@ __revision__ = "$Id$"
 #
 
 #--start constants--
-__version__ = "3.0rc3"
+__version__ = "3.1a0"
 #--end constants--

Lib/idlelib/idlever.py

-IDLE_VERSION = "3.0rc3"
+IDLE_VERSION = "3.1a0"

README

-This is Python version 3.0 release candidate 3
-==============================================
+This is Python version 3.1 alpha 0
+==================================
 
 For notes specific to this release, see RELNOTES in this directory.
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 Python Software Foundation.
 All rights reserved.
 
-Python 3000 (a.k.a. "Py3k", and released as Python 3.0) is a new
-version of the language, which is incompatible with the 2.x line of
-releases.  The language is mostly the same, but many details,
-especially how built-in objects like dictionaries and strings work,
-have changed considerably, and a lot of deprecated features have
-finally been removed.
+Python 3.x is a new version of the language, which is incompatible with the
+2.x line of releases.  The language is mostly the same, but many details,
+especially how built-in objects like dictionaries and strings work, have
+changed considerably, and a lot of deprecated features have finally been
+removed.
 
 This is an ongoing project; the cleanup isn't expected to be complete
 until some time in 2008.  In particular there are plans to reorganize
@@ -21,22 +20,15 @@ the standard library namespace.
 Release Schedule
 ----------------
 
-The release plan is to have a series of alpha releases in 2007 and 2008,
-beta releases in 2008, and a final release in October 2008.  The alpha
-releases are primarily aimed at developers who want a sneak peek at the
-new langauge, especially those folks who plan to port their code to
-Python 3000.  The hope is that by the time of the final release, many
-3rd party packages will already be available in a 3.0-compatible form.
-
-See PEP 361 for release details: http://www.python.org/dev/peps/pep-0361/
+See PEP XXX for release details: http://www.python.org/dev/peps/pep-XXX/
 
 
 Documentation
 -------------
 
-Documentation for Python 3000 is online, updated twice a day:
+Documentation for Python 3.1 is online, updated twice a day:
 
-    http://docs.python.org/dev/3.0/
+    http://docs.python.org/dev/3.1/
 
 All documentation is also available online at the Python web site
 (http://docs.python.org/, see below).  It is available online for
@@ -48,9 +40,9 @@ translators, and people with special formatting requirements.
 
 This is a work in progress; please help improve it!
 
-The design documents for Python 3000 are also online.  While the
-reference documentation is being updated, the PEPs are often the best
-source of information about new features.  Start by reading PEP 3000:
+The design documents for Python 3 are also online.  While the reference
+documentation is being updated, the PEPs are often the best source of
+information about new features.  Start by reading PEP 3000:
 
     http://python.org/dev/peps/pep-3000/
 
@@ -58,15 +50,15 @@ source of information about new features.  Start by reading PEP 3000:
 What's New
 ----------
 
-For an overview of what's new in Python 3000, see Guido van Rossum's
-blog at artima.com:
+For an overview of what's new in Python 3, see Guido van Rossum's blog at
+artima.com:
 
     http://www.artima.com/weblogs/index.jsp?blogger=guido
 
 We try to eventually have a comprehensive overview of the changes in
-the "What's New in Python 3.0" document, found at
+the "What's New in Python 3.1" document, found at
 
-    http://docs.python.org/dev/3.0/whatsnew/3.0
+    http://docs.python.org/dev/3.1/whatsnew/3.1
 
 Please help write it!
 
@@ -88,13 +80,12 @@ current PEPs, as well as guidelines for submitting a new PEP, are listed at
 http://www.python.org/dev/peps/.
 
 
-Converting From Python 2.x to 3.0
+Converting From Python 2.x to 3.x
 ---------------------------------
 
-Python 2.6 (to be released concurrent with Python 3.0) will contain features
-to help locating code that needs to be changed, such as optional warnings when
-deprecated features are used, and backported versions of certain key Python
-3000 features.
+Python starting with 2.6 will contain features to help locating code that
+needs to be changed, such as optional warnings when deprecated features are
+used, and backported versions of certain key Python 3.x features.
 
 
 Installing multiple versions

RELNOTES

-Python 3.0 Release Notes
-========================
+Python 3 Release Notes
+======================
 
-These release notes describe unfinished work, or important notes that Python
-3.0 adopters need to be aware of.  This is not a complete list of changes for
-Python 3.0 -- for that, see Misc/NEWS.
+These release notes describe unfinished work, or important notes that Python 3
+adopters need to be aware of.  This is not a complete list of changes for
+Python 3 -- for that, see Misc/NEWS.
 
 Please report bugs to http://bugs.python.org/
 
-The list of all known open issues for Python 3.0 can be found here:
+The list of all known open issues for Python 3 can be found here:
 
 http://bugs.python.org/issue?%40search_text=&title=&%40columns=title&id=&%40columns=id&creation=&creator=&activity=&%40columns=activity&%40sort=activity&actor=&nosy=&type=&components=&versions=12&dependencies=&assignee=&keywords=&priority=&%40group=priority&status=1&%40columns=status&resolution=&%40pagesize=50&%40startwith=0&%40queryname=&%40old-queryname=&%40action=search
 
 
-Additional notes for Python 3.0 final
--------------------------------------
+Additional notes for Python 3
+-----------------------------
 
 * The bsddb3 package has been removed from the standard library.  It is
   available as a separate distutils based package from the Python Cheeseshop.
-  If you need bsddb3 support in Python 3.0, you can find it here:
+  If you need bsddb3 support in Python 3, you can find it here:
 
   http://pypi.python.org/pypi/bsddb3
 
 * The email package needs quite a bit of work to make it consistent with
   respect to bytes and strings.  There have been discussions on
-  email-sig@python.org about where to go with the email package for 3.0, but
-  this was not resolved in time for 3.0 final.  With enough care though, the
-  email package in Python 3.0 should be about as usable as it is with Python
+  email-sig@python.org about where to go with the email package for Python 3,
+  but this was not resolved in time for 3.0 final.  With enough care though,
+  the email package in Python 3 should be about as usable as it is with Python
   2.