Mailing List Archive

http://hg.python.org/cpython/rev/8aab13719c02
changeset: 76732:8aab13719c02
branch: 2.7
parent: 76727:e606c123244f
user: Ezio Melotti <ezio.melotti@gmail.com>
date: Thu May 03 19:21:40 2012 +0300
summary:
Use Python 3 instead of 3.0.

files:
Doc/c-api/buffer.rst | 2 +-
Doc/c-api/objbuffer.rst | 2 +-
Doc/c-api/typeobj.rst | 2 +-
Doc/glossary.rst | 2 +-
Doc/howto/sorting.rst | 4 ++--
Doc/library/2to3.rst | 2 +-
Doc/library/_winreg.rst | 4 ++--
Doc/library/al.rst | 4 ++--
Doc/library/anydbm.rst | 4 ++--
Doc/library/basehttpserver.rst | 4 ++--
Doc/library/bastion.rst | 2 +-
Doc/library/binascii.rst | 2 +-
Doc/library/bsddb.rst | 4 ++--
Doc/library/carbon.rst | 2 +-
Doc/library/cd.rst | 2 +-
Doc/library/cgihttpserver.rst | 4 ++--
Doc/library/commands.rst | 2 +-
Doc/library/compiler.rst | 2 +-
Doc/library/configparser.rst | 4 ++--
Doc/library/cookie.rst | 4 ++--
Doc/library/cookielib.rst | 4 ++--
Doc/library/copy_reg.rst | 4 ++--
Doc/library/dbhash.rst | 2 +-
Doc/library/dbm.rst | 4 ++--
Doc/library/dircache.rst | 2 +-
Doc/library/dl.rst | 2 +-
Doc/library/docxmlrpcserver.rst | 4 ++--
Doc/library/dumbdbm.rst | 4 ++--
Doc/library/dummy_thread.rst | 4 ++--
Doc/library/fl.rst | 6 +++---
Doc/library/fm.rst | 2 +-
Doc/library/fpformat.rst | 2 +-
Doc/library/gdbm.rst | 4 ++--
Doc/library/gl.rst | 6 +++---
Doc/library/htmllib.rst | 6 +++---
Doc/library/httplib.rst | 4 ++--
Doc/library/imageop.rst | 2 +-
Doc/library/imgfile.rst | 2 +-
Doc/library/imputil.rst | 2 +-
Doc/library/jpeg.rst | 2 +-
Doc/library/macostools.rst | 2 +-
Doc/library/mailbox.rst | 2 +-
Doc/library/mhlib.rst | 2 +-
Doc/library/mutex.rst | 2 +-
Doc/library/new.rst | 2 +-
Doc/library/os.path.rst | 2 +-
Doc/library/parser.rst | 2 +-
Doc/library/queue.rst | 4 ++--
Doc/library/repr.rst | 4 ++--
Doc/library/rexec.rst | 2 +-
Doc/library/rfc822.rst | 2 +-
Doc/library/robotparser.rst | 4 ++--
Doc/library/scrolledtext.rst | 4 ++--
Doc/library/sgmllib.rst | 2 +-
Doc/library/simplehttpserver.rst | 4 ++--
Doc/library/simplexmlrpcserver.rst | 4 ++--
Doc/library/socketserver.rst | 4 ++--
Doc/library/statvfs.rst | 2 +-
Doc/library/stdtypes.rst | 2 +-
Doc/library/string.rst | 2 +-
Doc/library/sunaudio.rst | 4 ++--
Doc/library/sys.rst | 4 ++--
Doc/library/tarfile.rst | 2 +-
Doc/library/thread.rst | 4 ++--
Doc/library/tix.rst | 4 ++--
Doc/library/tkinter.rst | 6 +++---
Doc/library/urllib.rst | 8 ++++----
Doc/library/urllib2.rst | 4 ++--
Doc/library/urlparse.rst | 4 ++--
Doc/library/user.rst | 2 +-
Doc/library/userdict.rst | 10 +++++-----
Doc/library/warnings.rst | 2 +-
Doc/library/whichdb.rst | 4 ++--
Doc/library/xmlrpclib.rst | 4 ++--
Doc/reference/datamodel.rst | 6 +++---
Doc/reference/expressions.rst | 2 +-
76 files changed, 125 insertions(+), 125 deletions(-)


diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -33,7 +33,7 @@
Starting from version 1.6, Python has been providing Python-level buffer
objects and a C-level buffer API so that any built-in or used-defined type can
expose its characteristics. Both, however, have been deprecated because of
-various shortcomings, and have been officially removed in Python 3.0 in favour
+various shortcomings, and have been officially removed in Python 3 in favour
of a new C-level buffer API and a new Python-level object named
:class:`memoryview`.

diff --git a/Doc/c-api/objbuffer.rst b/Doc/c-api/objbuffer.rst
--- a/Doc/c-api/objbuffer.rst
+++ b/Doc/c-api/objbuffer.rst
@@ -8,7 +8,7 @@

This section describes the legacy buffer protocol, which has been introduced
in Python 1.6. It is still supported but deprecated in the Python 2.x series.
-Python 3.0 introduces a new buffer protocol which fixes weaknesses and
+Python 3 introduces a new buffer protocol which fixes weaknesses and
shortcomings of the protocol, and has been backported to Python 2.6. See
:ref:`bufferobjects` for more information.

diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1227,7 +1227,7 @@
- If the :const:`Py_TPFLAGS_CHECKTYPES` flag is set, binary and ternary
functions must check the type of all their operands, and implement the
necessary conversions (at least one of the operands is an instance of the
- defined type). This is the recommended way; with Python 3.0 coercion will
+ defined type). This is the recommended way; with Python 3 coercion will
disappear completely.

If the operation is not defined for the given operands, binary and ternary
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -80,7 +80,7 @@

classic class
Any class which does not inherit from :class:`object`. See
- :term:`new-style class`. Classic classes will be removed in Python 3.0.
+ :term:`new-style class`. Classic classes have been removed in Python 3.

coercion
The implicit conversion of an instance of one type to another during an
diff --git a/Doc/howto/sorting.rst b/Doc/howto/sorting.rst
--- a/Doc/howto/sorting.rst
+++ b/Doc/howto/sorting.rst
@@ -210,11 +210,11 @@
arguments. Instead, all of the Py2.x versions supported a *cmp* parameter to
handle user specified comparison functions.

-In Py3.0, the *cmp* parameter was removed entirely (as part of a larger effort to
+In Python 3, the *cmp* parameter was removed entirely (as part of a larger effort to
simplify and unify the language, eliminating the conflict between rich
comparisons and the :meth:`__cmp__` magic method).

-In Py2.x, sort allowed an optional function which can be called for doing the
+In Python 2, :meth:`~list.sort` allowed an optional function which can be called for doing the
comparisons. That function should take two arguments to be compared and then
return a negative value for less-than, return zero if they are equal, or return
a positive value for greater-than. For example, we can do:
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -314,7 +314,7 @@

Converts ``raise E, V`` to ``raise E(V)``, and ``raise E, V, T`` to ``raise
E(V).with_traceback(T)``. If ``E`` is a tuple, the translation will be
- incorrect because substituting tuples for exceptions has been removed in 3.0.
+ incorrect because substituting tuples for exceptions has been removed in Python 3.

.. 2to3fixer:: raw_input

diff --git a/Doc/library/_winreg.rst b/Doc/library/_winreg.rst
--- a/Doc/library/_winreg.rst
+++ b/Doc/library/_winreg.rst
@@ -7,9 +7,9 @@
.. sectionauthor:: Mark Hammond <MarkH@ActiveState.com>

.. note::
- The :mod:`_winreg` module has been renamed to :mod:`winreg` in Python 3.0.
+ The :mod:`_winreg` module has been renamed to :mod:`winreg` in Python 3.
The :term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.


.. versionadded:: 2.0
diff --git a/Doc/library/al.rst b/Doc/library/al.rst
--- a/Doc/library/al.rst
+++ b/Doc/library/al.rst
@@ -8,7 +8,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`al` module has been deprecated for removal in Python 3.0.
+ The :mod:`al` module has been removed in Python 3.


This module provides access to the audio facilities of the SGI Indy and Indigo
@@ -201,7 +201,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`AL` module has been deprecated for removal in Python 3.0.
+ The :mod:`AL` module has been removed in Python 3.


This module defines symbolic constants needed to use the built-in module
diff --git a/Doc/library/anydbm.rst b/Doc/library/anydbm.rst
--- a/Doc/library/anydbm.rst
+++ b/Doc/library/anydbm.rst
@@ -6,9 +6,9 @@


.. note::
- The :mod:`anydbm` module has been renamed to :mod:`dbm` in Python 3.0. The
+ The :mod:`anydbm` module has been renamed to :mod:`dbm` in Python 3. The
:term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.

.. index::
module: dbhash
diff --git a/Doc/library/basehttpserver.rst b/Doc/library/basehttpserver.rst
--- a/Doc/library/basehttpserver.rst
+++ b/Doc/library/basehttpserver.rst
@@ -6,8 +6,8 @@

.. note::
The :mod:`BaseHTTPServer` module has been merged into :mod:`http.server` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.


.. index::
diff --git a/Doc/library/bastion.rst b/Doc/library/bastion.rst
--- a/Doc/library/bastion.rst
+++ b/Doc/library/bastion.rst
@@ -7,7 +7,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`Bastion` module has been removed in Python 3.0.
+ The :mod:`Bastion` module has been removed in Python 3.

.. moduleauthor:: Barry Warsaw <bwarsaw@python.org>

diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst
--- a/Doc/library/binascii.rst
+++ b/Doc/library/binascii.rst
@@ -127,7 +127,7 @@
The return value is in the range [-2**31, 2**31-1]
regardless of platform. In the past the value would be signed on
some platforms and unsigned on others. Use & 0xffffffff on the
- value if you want it to match 3.0 behavior.
+ value if you want it to match Python 3 behavior.

.. versionchanged:: 3.0
The return value is unsigned and in the range [0, 2**32-1]
diff --git a/Doc/library/bsddb.rst b/Doc/library/bsddb.rst
--- a/Doc/library/bsddb.rst
+++ b/Doc/library/bsddb.rst
@@ -7,7 +7,7 @@
.. sectionauthor:: Skip Montanaro <skip@pobox.com>

.. deprecated:: 2.6
- The :mod:`bsddb` module has been deprecated for removal in Python 3.0.
+ The :mod:`bsddb` module has been removed in Python 3.


The :mod:`bsddb` module provides an interface to the Berkeley DB library. Users
@@ -86,7 +86,7 @@
This is present *only* to allow backwards compatibility with systems which ship
with the old Berkeley DB 1.85 database library. The :mod:`bsddb185` module
should never be used directly in new code. The module has been removed in
- Python 3.0. If you find you still need it look in PyPI.
+ Python 3. If you find you still need it look in PyPI.


.. seealso::
diff --git a/Doc/library/carbon.rst b/Doc/library/carbon.rst
--- a/Doc/library/carbon.rst
+++ b/Doc/library/carbon.rst
@@ -24,7 +24,7 @@

.. note::

- The Carbon modules have been removed in Python 3.0.
+ The Carbon modules have been removed in Python 3.


:mod:`Carbon.AE` --- Apple Events
diff --git a/Doc/library/cd.rst b/Doc/library/cd.rst
--- a/Doc/library/cd.rst
+++ b/Doc/library/cd.rst
@@ -9,7 +9,7 @@


.. deprecated:: 2.6
- The :mod:`cd` module has been deprecated for removal in Python 3.0.
+ The :mod:`cd` module has been removed in Python 3.


This module provides an interface to the Silicon Graphics CD library. It is
diff --git a/Doc/library/cgihttpserver.rst b/Doc/library/cgihttpserver.rst
--- a/Doc/library/cgihttpserver.rst
+++ b/Doc/library/cgihttpserver.rst
@@ -8,8 +8,8 @@

.. note::
The :mod:`CGIHTTPServer` module has been merged into :mod:`http.server` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.


The :mod:`CGIHTTPServer` module defines a request-handler class, interface
diff --git a/Doc/library/commands.rst b/Doc/library/commands.rst
--- a/Doc/library/commands.rst
+++ b/Doc/library/commands.rst
@@ -8,7 +8,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`commands` module has been removed in Python 3.0. Use the
+ The :mod:`commands` module has been removed in Python 3. Use the
:mod:`subprocess` module instead.

.. sectionauthor:: Sue Williams <sbw@provis.com>
diff --git a/Doc/library/compiler.rst b/Doc/library/compiler.rst
--- a/Doc/library/compiler.rst
+++ b/Doc/library/compiler.rst
@@ -6,7 +6,7 @@
***********************

.. deprecated:: 2.6
- The :mod:`compiler` package has been removed in Python 3.0.
+ The :mod:`compiler` package has been removed in Python 3.

.. sectionauthor:: Jeremy Hylton <jeremy@zope.com>

diff --git a/Doc/library/configparser.rst b/Doc/library/configparser.rst
--- a/Doc/library/configparser.rst
+++ b/Doc/library/configparser.rst
@@ -12,8 +12,8 @@
.. note::

The :mod:`ConfigParser` module has been renamed to :mod:`configparser` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.

.. index::
pair: .ini; file
diff --git a/Doc/library/cookie.rst b/Doc/library/cookie.rst
--- a/Doc/library/cookie.rst
+++ b/Doc/library/cookie.rst
@@ -8,8 +8,8 @@

.. note::
The :mod:`Cookie` module has been renamed to :mod:`http.cookies` in Python
- 3.0. The :term:`2to3` tool will automatically adapt imports when converting
- your sources to 3.0.
+ 3. The :term:`2to3` tool will automatically adapt imports when converting
+ your sources to Python 3.

**Source code:** :source:`Lib/Cookie.py`

diff --git a/Doc/library/cookielib.rst b/Doc/library/cookielib.rst
--- a/Doc/library/cookielib.rst
+++ b/Doc/library/cookielib.rst
@@ -8,8 +8,8 @@

.. note::
The :mod:`cookielib` module has been renamed to :mod:`http.cookiejar` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.

.. versionadded:: 2.4

diff --git a/Doc/library/copy_reg.rst b/Doc/library/copy_reg.rst
--- a/Doc/library/copy_reg.rst
+++ b/Doc/library/copy_reg.rst
@@ -5,9 +5,9 @@
:synopsis: Register pickle support functions.

.. note::
- The :mod:`copy_reg` module has been renamed to :mod:`copyreg` in Python 3.0.
+ The :mod:`copy_reg` module has been renamed to :mod:`copyreg` in Python 3.
The :term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.

.. index::
module: pickle
diff --git a/Doc/library/dbhash.rst b/Doc/library/dbhash.rst
--- a/Doc/library/dbhash.rst
+++ b/Doc/library/dbhash.rst
@@ -6,7 +6,7 @@
.. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>

.. deprecated:: 2.6
- The :mod:`dbhash` module has been deprecated for removal in Python 3.0.
+ The :mod:`dbhash` module has been removed in Python 3.

.. index:: module: bsddb

diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst
--- a/Doc/library/dbm.rst
+++ b/Doc/library/dbm.rst
@@ -6,9 +6,9 @@
:synopsis: The standard "database" interface, based on ndbm.

.. note::
- The :mod:`dbm` module has been renamed to :mod:`dbm.ndbm` in Python 3.0. The
+ The :mod:`dbm` module has been renamed to :mod:`dbm.ndbm` in Python 3. The
:term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.


The :mod:`dbm` module provides an interface to the Unix "(n)dbm" library. Dbm
diff --git a/Doc/library/dircache.rst b/Doc/library/dircache.rst
--- a/Doc/library/dircache.rst
+++ b/Doc/library/dircache.rst
@@ -7,7 +7,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`dircache` module has been removed in Python 3.0.
+ The :mod:`dircache` module has been removed in Python 3.


.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
diff --git a/Doc/library/dl.rst b/Doc/library/dl.rst
--- a/Doc/library/dl.rst
+++ b/Doc/library/dl.rst
@@ -8,7 +8,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`dl` module has been removed in Python 3.0. Use the :mod:`ctypes`
+ The :mod:`dl` module has been removed in Python 3. Use the :mod:`ctypes`
module instead.

.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
diff --git a/Doc/library/docxmlrpcserver.rst b/Doc/library/docxmlrpcserver.rst
--- a/Doc/library/docxmlrpcserver.rst
+++ b/Doc/library/docxmlrpcserver.rst
@@ -8,8 +8,8 @@

.. note::
The :mod:`DocXMLRPCServer` module has been merged into :mod:`xmlrpc.server`
- in Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ in Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.


.. versionadded:: 2.3
diff --git a/Doc/library/dumbdbm.rst b/Doc/library/dumbdbm.rst
--- a/Doc/library/dumbdbm.rst
+++ b/Doc/library/dumbdbm.rst
@@ -5,9 +5,9 @@
:synopsis: Portable implementation of the simple DBM interface.

.. note::
- The :mod:`dumbdbm` module has been renamed to :mod:`dbm.dumb` in Python 3.0.
+ The :mod:`dumbdbm` module has been renamed to :mod:`dbm.dumb` in Python 3.
The :term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.

.. index:: single: databases

diff --git a/Doc/library/dummy_thread.rst b/Doc/library/dummy_thread.rst
--- a/Doc/library/dummy_thread.rst
+++ b/Doc/library/dummy_thread.rst
@@ -6,8 +6,8 @@

.. note::
The :mod:`dummy_thread` module has been renamed to :mod:`_dummy_thread` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0; however, you should consider using the
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3; however, you should consider using the
high-lever :mod:`dummy_threading` module instead.

**Source code:** :source:`Lib/dummy_thread.py`
diff --git a/Doc/library/fl.rst b/Doc/library/fl.rst
--- a/Doc/library/fl.rst
+++ b/Doc/library/fl.rst
@@ -9,7 +9,7 @@


.. deprecated:: 2.6
- The :mod:`fl` module has been deprecated for removal in Python 3.0.
+ The :mod:`fl` module has been removed in Python 3.


.. index::
@@ -487,7 +487,7 @@


.. deprecated:: 2.6
- The :mod:`FL` module has been deprecated for removal in Python 3.0.
+ The :mod:`FL` module has been removed in Python 3.


This module defines symbolic constants needed to use the built-in module
@@ -509,7 +509,7 @@


.. deprecated:: 2.6
- The :mod:`flp` module has been deprecated for removal in Python 3.0.
+ The :mod:`flp` module has been removed in Python 3.


This module defines functions that can read form definitions created by the
diff --git a/Doc/library/fm.rst b/Doc/library/fm.rst
--- a/Doc/library/fm.rst
+++ b/Doc/library/fm.rst
@@ -8,7 +8,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`fm` module has been deprecated for removal in Python 3.0.
+ The :mod:`fm` module has been removed in Python 3.



diff --git a/Doc/library/fpformat.rst b/Doc/library/fpformat.rst
--- a/Doc/library/fpformat.rst
+++ b/Doc/library/fpformat.rst
@@ -7,7 +7,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`fpformat` module has been removed in Python 3.0.
+ The :mod:`fpformat` module has been removed in Python 3.

.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>

diff --git a/Doc/library/gdbm.rst b/Doc/library/gdbm.rst
--- a/Doc/library/gdbm.rst
+++ b/Doc/library/gdbm.rst
@@ -6,9 +6,9 @@
:synopsis: GNU's reinterpretation of dbm.

.. note::
- The :mod:`gdbm` module has been renamed to :mod:`dbm.gnu` in Python 3.0. The
+ The :mod:`gdbm` module has been renamed to :mod:`dbm.gnu` in Python 3. The
:term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.


.. index:: module: dbm
diff --git a/Doc/library/gl.rst b/Doc/library/gl.rst
--- a/Doc/library/gl.rst
+++ b/Doc/library/gl.rst
@@ -8,7 +8,7 @@


.. deprecated:: 2.6
- The :mod:`gl` module has been deprecated for removal in Python 3.0.
+ The :mod:`gl` module has been removed in Python 3.


This module provides access to the Silicon Graphics *Graphics Library*. It is
@@ -168,7 +168,7 @@


.. deprecated:: 2.6
- The :mod:`DEVICE` module has been deprecated for removal in Python 3.0.
+ The :mod:`DEVICE` module has been removed in Python 3.


This modules defines the constants used by the Silicon Graphics *Graphics
@@ -186,7 +186,7 @@


.. deprecated:: 2.6
- The :mod:`GL` module has been deprecated for removal in Python 3.0.
+ The :mod:`GL` module has been removed in Python 3.

This module contains constants used by the Silicon Graphics *Graphics Library*
from the C header file ``<gl/gl.h>``. Read the module source file for details.
diff --git a/Doc/library/htmllib.rst b/Doc/library/htmllib.rst
--- a/Doc/library/htmllib.rst
+++ b/Doc/library/htmllib.rst
@@ -6,7 +6,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`htmllib` module has been removed in Python 3.0.
+ The :mod:`htmllib` module has been removed in Python 3.


.. index::
@@ -162,8 +162,8 @@
.. note::

The :mod:`htmlentitydefs` module has been renamed to :mod:`html.entities` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.

**Source code:** :source:`Lib/htmlentitydefs.py`

diff --git a/Doc/library/httplib.rst b/Doc/library/httplib.rst
--- a/Doc/library/httplib.rst
+++ b/Doc/library/httplib.rst
@@ -6,8 +6,8 @@

.. note::
The :mod:`httplib` module has been renamed to :mod:`http.client` in Python
- 3.0. The :term:`2to3` tool will automatically adapt imports when converting
- your sources to 3.0.
+ 3. The :term:`2to3` tool will automatically adapt imports when converting
+ your sources to Python 3.


.. index::
diff --git a/Doc/library/imageop.rst b/Doc/library/imageop.rst
--- a/Doc/library/imageop.rst
+++ b/Doc/library/imageop.rst
@@ -7,7 +7,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`imageop` module has been removed in Python 3.0.
+ The :mod:`imageop` module has been removed in Python 3.

The :mod:`imageop` module contains some useful operations on images. It operates
on images consisting of 8 or 32 bit pixels stored in Python strings. This is
diff --git a/Doc/library/imgfile.rst b/Doc/library/imgfile.rst
--- a/Doc/library/imgfile.rst
+++ b/Doc/library/imgfile.rst
@@ -8,7 +8,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`imgfile` module has been deprecated for removal in Python 3.0.
+ The :mod:`imgfile` module has been removed in Python 3.



diff --git a/Doc/library/imputil.rst b/Doc/library/imputil.rst
--- a/Doc/library/imputil.rst
+++ b/Doc/library/imputil.rst
@@ -7,7 +7,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`imputil` module has been removed in Python 3.0.
+ The :mod:`imputil` module has been removed in Python 3.


.. index:: statement: import
diff --git a/Doc/library/jpeg.rst b/Doc/library/jpeg.rst
--- a/Doc/library/jpeg.rst
+++ b/Doc/library/jpeg.rst
@@ -8,7 +8,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`jpeg` module has been deprecated for removal in Python 3.0.
+ The :mod:`jpeg` module has been removed in Python 3.



diff --git a/Doc/library/macostools.rst b/Doc/library/macostools.rst
--- a/Doc/library/macostools.rst
+++ b/Doc/library/macostools.rst
@@ -15,7 +15,7 @@

.. note::

- This module has been removed in Python 3.0.
+ This module has been removed in Python 3.



diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -1513,7 +1513,7 @@
mailboxes, such as adding or removing message, and do not provide classes to
represent format-specific message properties. For backward compatibility, the
older mailbox classes are still available, but the newer classes should be used
-in preference to them. The old classes will be removed in Python 3.0.
+in preference to them. The old classes will be removed in Python 3.

Older mailbox objects support only iteration and provide a single public method:

diff --git a/Doc/library/mhlib.rst b/Doc/library/mhlib.rst
--- a/Doc/library/mhlib.rst
+++ b/Doc/library/mhlib.rst
@@ -6,7 +6,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`mhlib` module has been removed in Python 3.0. Use the
+ The :mod:`mhlib` module has been removed in Python 3. Use the
:mod:`mailbox` instead.

.. sectionauthor:: Skip Montanaro <skip@pobox.com>
diff --git a/Doc/library/mutex.rst b/Doc/library/mutex.rst
--- a/Doc/library/mutex.rst
+++ b/Doc/library/mutex.rst
@@ -7,7 +7,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`mutex` module has been removed in Python 3.0.
+ The :mod:`mutex` module has been removed in Python 3.

.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>

diff --git a/Doc/library/new.rst b/Doc/library/new.rst
--- a/Doc/library/new.rst
+++ b/Doc/library/new.rst
@@ -6,7 +6,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`new` module has been removed in Python 3.0. Use the :mod:`types`
+ The :mod:`new` module has been removed in Python 3. Use the :mod:`types`
module's classes instead.

.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -331,7 +331,7 @@

.. note::

- This function is deprecated and has been removed in 3.0 in favor of
+ This function is deprecated and has been removed in Python 3 in favor of
:func:`os.walk`.


diff --git a/Doc/library/parser.rst b/Doc/library/parser.rst
--- a/Doc/library/parser.rst
+++ b/Doc/library/parser.rst
@@ -34,7 +34,7 @@
replaced by "ast"; this is a legacy from the time when there was no other
AST and has nothing to do with the AST found in Python 2.5. This is also the
reason for the functions' keyword arguments being called *ast*, not *st*.
- The "ast" functions will be removed in Python 3.0.
+ The "ast" functions will be removed in Python 3.

There are a few things to note about this module which are important to making
use of the data structures created. This is not a tutorial on editing the parse
diff --git a/Doc/library/queue.rst b/Doc/library/queue.rst
--- a/Doc/library/queue.rst
+++ b/Doc/library/queue.rst
@@ -5,9 +5,9 @@
:synopsis: A synchronized queue class.

.. note::
- The :mod:`Queue` module has been renamed to :mod:`queue` in Python 3.0. The
+ The :mod:`Queue` module has been renamed to :mod:`queue` in Python 3. The
:term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.

**Source code:** :source:`Lib/Queue.py`

diff --git a/Doc/library/repr.rst b/Doc/library/repr.rst
--- a/Doc/library/repr.rst
+++ b/Doc/library/repr.rst
@@ -6,9 +6,9 @@
.. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>

.. note::
- The :mod:`repr` module has been renamed to :mod:`reprlib` in Python 3.0. The
+ The :mod:`repr` module has been renamed to :mod:`reprlib` in Python 3. The
:term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.

**Source code:** :source:`Lib/repr.py`

diff --git a/Doc/library/rexec.rst b/Doc/library/rexec.rst
--- a/Doc/library/rexec.rst
+++ b/Doc/library/rexec.rst
@@ -6,7 +6,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`rexec` module has been removed in Python 3.0.
+ The :mod:`rexec` module has been removed in Python 3.

.. versionchanged:: 2.3
Disabled module.
diff --git a/Doc/library/rfc822.rst b/Doc/library/rfc822.rst
--- a/Doc/library/rfc822.rst
+++ b/Doc/library/rfc822.rst
@@ -10,7 +10,7 @@
.. deprecated:: 2.3
The :mod:`email` package should be used in preference to the :mod:`rfc822`
module. This module is present only to maintain backward compatibility, and
- has been removed in 3.0.
+ has been removed in Python 3.

This module defines a class, :class:`Message`, which represents an "email
message" as defined by the Internet standard :rfc:`2822`. [#]_ Such messages
diff --git a/Doc/library/robotparser.rst b/Doc/library/robotparser.rst
--- a/Doc/library/robotparser.rst
+++ b/Doc/library/robotparser.rst
@@ -16,9 +16,9 @@

.. note::
The :mod:`robotparser` module has been renamed :mod:`urllib.robotparser` in
- Python 3.0.
+ Python 3.
The :term:`2to3` tool will automatically adapt imports when converting
- your sources to 3.0.
+ your sources to Python 3.

This module provides a single class, :class:`RobotFileParser`, which answers
questions about whether or not a particular user agent can fetch a URL on the
diff --git a/Doc/library/scrolledtext.rst b/Doc/library/scrolledtext.rst
--- a/Doc/library/scrolledtext.rst
+++ b/Doc/library/scrolledtext.rst
@@ -16,8 +16,8 @@
.. note::

:mod:`ScrolledText` has been renamed to :mod:`tkinter.scrolledtext` in Python
- 3.0. The :term:`2to3` tool will automatically adapt imports when converting
- your sources to 3.0.
+ 3. The :term:`2to3` tool will automatically adapt imports when converting
+ your sources to Python 3.

The text widget and scrollbar are packed together in a :class:`Frame`, and the
methods of the :class:`Grid` and :class:`Pack` geometry managers are acquired
diff --git a/Doc/library/sgmllib.rst b/Doc/library/sgmllib.rst
--- a/Doc/library/sgmllib.rst
+++ b/Doc/library/sgmllib.rst
@@ -6,7 +6,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`sgmllib` module has been removed in Python 3.0.
+ The :mod:`sgmllib` module has been removed in Python 3.

.. index:: single: SGML

diff --git a/Doc/library/simplehttpserver.rst b/Doc/library/simplehttpserver.rst
--- a/Doc/library/simplehttpserver.rst
+++ b/Doc/library/simplehttpserver.rst
@@ -8,8 +8,8 @@

.. note::
The :mod:`SimpleHTTPServer` module has been merged into :mod:`http.server` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.


The :mod:`SimpleHTTPServer` module defines a single class,
diff --git a/Doc/library/simplexmlrpcserver.rst b/Doc/library/simplexmlrpcserver.rst
--- a/Doc/library/simplexmlrpcserver.rst
+++ b/Doc/library/simplexmlrpcserver.rst
@@ -8,8 +8,8 @@

.. note::
The :mod:`SimpleXMLRPCServer` module has been merged into
- :mod:`xmlrpc.server` in Python 3.0. The :term:`2to3` tool will automatically
- adapt imports when converting your sources to 3.0.
+ :mod:`xmlrpc.server` in Python 3. The :term:`2to3` tool will automatically
+ adapt imports when converting your sources to Python 3.


.. versionadded:: 2.2
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -7,8 +7,8 @@
.. note::

The :mod:`SocketServer` module has been renamed to :mod:`socketserver` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.

**Source code:** :source:`Lib/SocketServer.py`

diff --git a/Doc/library/statvfs.rst b/Doc/library/statvfs.rst
--- a/Doc/library/statvfs.rst
+++ b/Doc/library/statvfs.rst
@@ -6,7 +6,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`statvfs` module has been deprecated for removal in Python 3.0.
+ The :mod:`statvfs` module has been removed in Python 3.


.. sectionauthor:: Moshe Zadka <moshez@zadka.site.co.il>
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -969,7 +969,7 @@
See :ref:`formatstrings` for a description of the various formatting options
that can be specified in format strings.

- This method of string formatting is the new standard in Python 3.0, and
+ This method of string formatting is the new standard in Python 3, and
should be preferred to the ``%`` formatting described in
:ref:`string-formatting` in new code.

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -793,7 +793,7 @@
The following list of functions are also defined as methods of string and
Unicode objects; see section :ref:`string-methods` for more information on
those. You should consider these functions as deprecated, although they will
-not be removed until Python 3.0. The functions defined in this module are:
+not be removed until Python 3. The functions defined in this module are:


.. function:: atof(s)
diff --git a/Doc/library/sunaudio.rst b/Doc/library/sunaudio.rst
--- a/Doc/library/sunaudio.rst
+++ b/Doc/library/sunaudio.rst
@@ -8,7 +8,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`sunaudiodev` module has been deprecated for removal in Python 3.0.
+ The :mod:`sunaudiodev` module has been removed in Python 3.



@@ -153,7 +153,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`SUNAUDIODEV` module has been deprecated for removal in Python 3.0.
+ The :mod:`SUNAUDIODEV` module has been removed in Python 3.



diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -797,10 +797,10 @@

.. data:: py3kwarning

- Bool containing the status of the Python 3.0 warning flag. It's ``True``
+ Bool containing the status of the Python 3 warning flag. It's ``True``
when Python is started with the -3 option. (This should be considered
read-only; setting it to a different value doesn't have an effect on
- Python 3.0 warnings.)
+ Python 3 warnings.)

.. versionadded:: 2.6

diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -143,7 +143,7 @@


.. deprecated:: 2.6
- The :class:`TarFileCompat` class has been deprecated for removal in Python 3.0.
+ The :class:`TarFileCompat` class has been removed in Python 3.


.. exception:: TarError
diff --git a/Doc/library/thread.rst b/Doc/library/thread.rst
--- a/Doc/library/thread.rst
+++ b/Doc/library/thread.rst
@@ -5,9 +5,9 @@
:synopsis: Create multiple threads of control within one interpreter.

.. note::
- The :mod:`thread` module has been renamed to :mod:`_thread` in Python 3.0.
+ The :mod:`thread` module has been renamed to :mod:`_thread` in Python 3.
The :term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0; however, you should consider using the high-level
+ sources to Python 3; however, you should consider using the high-level
:mod:`threading` module instead.


diff --git a/Doc/library/tix.rst b/Doc/library/tix.rst
--- a/Doc/library/tix.rst
+++ b/Doc/library/tix.rst
@@ -24,9 +24,9 @@

.. note::

- :mod:`Tix` has been renamed to :mod:`tkinter.tix` in Python 3.0. The
+ :mod:`Tix` has been renamed to :mod:`tkinter.tix` in Python 3. The
:term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.

.. seealso::

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -13,9 +13,9 @@

.. note::

- :mod:`Tkinter` has been renamed to :mod:`tkinter` in Python 3.0. The
+ :mod:`Tkinter` has been renamed to :mod:`tkinter` in Python 3. The
:term:`2to3` tool will automatically adapt imports when converting your
- sources to 3.0.
+ sources to Python 3.

.. seealso::

@@ -109,7 +109,7 @@
:mod:`turtle`
Turtle graphics in a Tk window.

-These have been renamed as well in Python 3.0; they were all made submodules of
+These have been renamed as well in Python 3; they were all made submodules of
the new ``tkinter`` package.


diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -6,11 +6,11 @@

.. note::
The :mod:`urllib` module has been split into parts and renamed in
- Python 3.0 to :mod:`urllib.request`, :mod:`urllib.parse`,
+ Python 3 to :mod:`urllib.request`, :mod:`urllib.parse`,
and :mod:`urllib.error`. The :term:`2to3` tool will automatically adapt
- imports when converting your sources to 3.0.
+ imports when converting your sources to Python 3.
Also note that the :func:`urllib.urlopen` function has been removed in
- Python 3.0 in favor of :func:`urllib2.urlopen`.
+ Python 3 in favor of :func:`urllib2.urlopen`.

.. index::
single: WWW
@@ -131,7 +131,7 @@
:envvar:`no_proxy` environment variable.

.. deprecated:: 2.6
- The :func:`urlopen` function has been removed in Python 3.0 in favor
+ The :func:`urlopen` function has been removed in Python 3 in favor
of :func:`urllib2.urlopen`.


diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
--- a/Doc/library/urllib2.rst
+++ b/Doc/library/urllib2.rst
@@ -9,9 +9,9 @@

.. note::
The :mod:`urllib2` module has been split across several modules in
- Python 3.0 named :mod:`urllib.request` and :mod:`urllib.error`.
+ Python 3 named :mod:`urllib.request` and :mod:`urllib.error`.
The :term:`2to3` tool will automatically adapt imports when converting
- your sources to 3.0.
+ your sources to Python 3.


The :mod:`urllib2` module defines functions and classes which help in opening
diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -13,9 +13,9 @@
pair: relative; URL

.. note::
- The :mod:`urlparse` module is renamed to :mod:`urllib.parse` in Python 3.0.
+ The :mod:`urlparse` module is renamed to :mod:`urllib.parse` in Python 3.
The :term:`2to3` tool will automatically adapt imports when converting
- your sources to 3.0.
+ your sources to Python 3.

**Source code:** :source:`Lib/urlparse.py`

diff --git a/Doc/library/user.rst b/Doc/library/user.rst
--- a/Doc/library/user.rst
+++ b/Doc/library/user.rst
@@ -7,7 +7,7 @@
:deprecated:

.. deprecated:: 2.6
- The :mod:`user` module has been removed in Python 3.0.
+ The :mod:`user` module has been removed in Python 3.

.. index::
pair: .pythonrc.py; file
diff --git a/Doc/library/userdict.rst b/Doc/library/userdict.rst
--- a/Doc/library/userdict.rst
+++ b/Doc/library/userdict.rst
@@ -114,8 +114,8 @@

.. note::
The :class:`UserList` class has been moved to the :mod:`collections`
- module in Python 3.0. The :term:`2to3` tool will automatically adapt
- imports when converting your sources to 3.0.
+ module in Python 3. The :term:`2to3` tool will automatically adapt
+ imports when converting your sources to Python 3.


In addition to supporting the methods and operations of mutable sequences (see
@@ -187,8 +187,8 @@

.. note::
The :class:`UserString` class has been moved to the :mod:`collections`
- module in Python 3.0. The :term:`2to3` tool will automatically adapt
- imports when converting your sources to 3.0.
+ module in Python 3. The :term:`2to3` tool will automatically adapt
+ imports when converting your sources to Python 3.



@@ -203,7 +203,7 @@
hard to track down.

.. deprecated:: 2.6
- The :class:`MutableString` class has been removed in Python 3.0.
+ The :class:`MutableString` class has been removed in Python 3.

In addition to supporting the methods and operations of string and Unicode
objects (see section :ref:`string-methods`), :class:`UserString` instances
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -419,7 +419,7 @@

.. note::

- In Python 3.0, the arguments to the constructor for
+ In Python 3, the arguments to the constructor for
:class:`catch_warnings` are keyword-only arguments.

.. versionadded:: 2.6
diff --git a/Doc/library/whichdb.rst b/Doc/library/whichdb.rst
--- a/Doc/library/whichdb.rst
+++ b/Doc/library/whichdb.rst
@@ -6,8 +6,8 @@

.. note::
The :mod:`whichdb` module's only function has been put into the :mod:`dbm`
- module in Python 3.0. The :term:`2to3` tool will automatically adapt imports
- when converting your sources to 3.0.
+ module in Python 3. The :term:`2to3` tool will automatically adapt imports
+ when converting your sources to Python 3.


The single function in this module attempts to guess which of the several simple
diff --git a/Doc/library/xmlrpclib.rst b/Doc/library/xmlrpclib.rst
--- a/Doc/library/xmlrpclib.rst
+++ b/Doc/library/xmlrpclib.rst
@@ -8,8 +8,8 @@

.. note::
The :mod:`xmlrpclib` module has been renamed to :mod:`xmlrpc.client` in
- Python 3.0. The :term:`2to3` tool will automatically adapt imports when
- converting your sources to 3.0.
+ Python 3. The :term:`2to3` tool will automatically adapt imports when
+ converting your sources to Python 3.


.. XXX Not everything is documented yet. It might be good to describe
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -573,7 +573,7 @@
:attr:`im_self` used to refer to the class that defined the method.

.. versionchanged:: 2.6
- For 3.0 forward-compatibility, :attr:`im_func` is also available as
+ For Python 3 forward-compatibility, :attr:`im_func` is also available as
:attr:`__func__`, and :attr:`im_self` as :attr:`__self__`.

.. index::
@@ -1149,7 +1149,7 @@
single: class; classic
single: class; old-style

-Old-style classes are removed in Python 3.0, leaving only the semantics of
+Old-style classes are removed in Python 3, leaving only the semantics of
new-style classes.


@@ -2235,7 +2235,7 @@
This section used to document the rules for coercion. As the language has
evolved, the coercion rules have become hard to document precisely; documenting
what one version of one particular implementation does is undesirable. Instead,
-here are some informal guidelines regarding coercion. In Python 3.0, coercion
+here are some informal guidelines regarding coercion. In Python 3, coercion
will not be supported.

*
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1392,7 +1392,7 @@

.. [#] In Python 2.3 and later releases, a list comprehension "leaks" the control
variables of each ``for`` it contains into the containing scope. However, this
- behavior is deprecated, and relying on it will not work in Python 3.0
+ behavior is deprecated, and relying on it will not work in Python 3.

.. [#] While ``abs(x%y) < abs(y)`` is true mathematically, for floats it may not be
true numerically due to roundoff. For example, and assuming a platform on which

--
Repository URL: http://hg.python.org/cpython