Prep for Python 3.1!

warsaw · warsaw · commit 97f005d137b5 · 2008-12-03T16:46:14.000Z
diff --git a/Doc/license.rst b/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::
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
@@ -10,23 +10,23 @@ 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
 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.
 
diff --git a/Doc/tutorial/stdlib.rst b/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
diff --git a/Doc/tutorial/stdlib2.rst b/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'
 
diff --git a/Include/patchlevel.h b/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) */
diff --git a/LICENSE b/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:
 
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
@@ -20,5 +20,5 @@
 #
 
 #--start constants--
-__version__ = "3.0rc3"
+__version__ = "3.1a0"
 #--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.0rc3"
+IDLE_VERSION = "3.1a0"
diff --git a/Misc/HISTORY b/Misc/HISTORY
diff --git a/Misc/NEWS b/Misc/NEWS
diff --git a/README b/README
diff --git a/RELNOTES b/RELNOTES

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ operating system::`
`17`	`17`	`>>> os.system('time 0:02')`
`18`	`18`	`0`
`19`	`19`	`>>> os.getcwd() # Return the current working directory`
`20`		`- 'C:\\Python30'`
	`20`	`+ 'C:\\Python31'`
`21`	`21`	`>>> os.chdir('/server/accesslogs')`
`22`	`22`
`23`	`23`	Be sure to use the ``import os`` style instead of ``from os import *``. This
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`#`
`21`	`21`
`22`	`22`	`#--start constants--`
`23`		`-__version__ = "3.0rc3"`
	`23`	`+__version__ = "3.1a0"`
`24`	`24`	`#--end constants--`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-IDLE_VERSION = "3.0rc3"`
	`1`	`+IDLE_VERSION = "3.1a0"`