summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2008-12-03 16:46:14 (GMT)
committerBarry Warsaw <barry@python.org>2008-12-03 16:46:14 (GMT)
commit97f005d137b59887e64fed801197aae1b3597083 (patch)
tree4859c2940d554db1c2085b996ba6ba0260dca79a /Doc
parent815427c481fbef0f9110f4e3d3e4c2d9eebd64cd (diff)
downloadcpython-97f005d137b59887e64fed801197aae1b3597083.zip
cpython-97f005d137b59887e64fed801197aae1b3597083.tar.gz
cpython-97f005d137b59887e64fed801197aae1b3597083.tar.bz2
Prep for Python 3.1!
Diffstat (limited to 'Doc')
-rw-r--r--Doc/license.rst2
-rw-r--r--Doc/tutorial/interpreter.rst18
-rw-r--r--Doc/tutorial/stdlib.rst2
-rw-r--r--Doc/tutorial/stdlib2.rst2
4 files changed, 12 insertions, 12 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index 892b5ea..dac7100 100644
--- 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
index 010bc6b..e93b567 100644
--- a/Doc/tutorial/interpreter.rst
+++ b/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.
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 9bc0890..3b1f1fc 100644
--- 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
index 84dfb61..a06a20b 100644
--- 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'