Use Python 3 instead of 3.0.

diff --git a/Doc/c-api/buffer.rst b/Doc/c-api/buffer.rst
index 7b6d1ae128acebfd0a239f9db4a2ba6fc2ce9472..e028369c5010d93c602845d3f216e535b7f11270 100644 (file)
--- a/Doc/c-api/buffer.rst
+++ b/Doc/c-api/buffer.rst
@@ -33,7 +33,7 @@ returning data from the target object.
 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
index 90dce62ecb7ae8dc362c73aa0d2f36773cc077d0..c5228c6f43838732ea7ffbf31a9f021a57d103fe 100644 (file)
--- a/Doc/c-api/objbuffer.rst
+++ b/Doc/c-api/objbuffer.rst
@@ -8,7 +8,7 @@ Old Buffer Protocol
 
 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
index 5bda1ff1754cedb6bddabf7c34047c6356be3925..7c37786ddf9716a8ddb6d05141f99bd3f138ef3c 100644 (file)
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -1227,7 +1227,7 @@ on the flag bit :const:`Py_TPFLAGS_CHECKTYPES`:
 - 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
index e3043813b3ff1dc424dedbc41399263470494a3d..d2d5e32a26d9ad999b575425135ca74bcbb15cef 100644 (file)
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -80,7 +80,7 @@ Glossary
 
    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
index 7afab9d73246cdec4f321cc98a69537a12a6af45..56b65b0d875923fcae90d757f87b94aac8a7729a 100644 (file)
--- a/Doc/howto/sorting.rst
+++ b/Doc/howto/sorting.rst
@@ -210,11 +210,11 @@ there was no :func:`sorted` builtin and :meth:`list.sort` took no keyword
 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
index d08c8535fce252f7ea62fba93b95d37af66008ed..7942dd3cd60d855c668c5b95f60b1945e866d88e 100644 (file)
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -314,7 +314,7 @@ and off individually.  They are described here in more detail.
 
    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
index 825ce1fb2e13e84eb54a9b88b42d0997eebdd6c6..f82d1c5c2ba8fa9cff2b1eaad60ef3e3f07d3619 100644 (file)
--- 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
index ad2eaea0db748fb32a93121c9ddbddfb709befc3..f796c5c3f2872c6d781dd5aef54d36fc16a2a6b1 100644 (file)
--- 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 @@ Port objects, as returned by :func:`openport`, have the following methods:
    :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
index 7c6f99ffd22451ec21344d22123b682ad80616d3..86d8a59b859273c6444ab3e92e537ab8e82d857c 100644 (file)
--- 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
index e5a9ebb16e587119557d886614065a4f84578e4c..01776af50b9fa1a8e64f224552be16d24ab95c14 100644 (file)
--- 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
index 8f103e7a02826c53991e73cc498a852a28e28b9c..2e3efcdce2aa5df1bd605956e02c5946122417c3 100644 (file)
--- 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
index 23939de1cd27762f4d187cea09acb4ce5aa9fb25..0f8a3dec6be1f38e0e40137412365101923f13a1 100644 (file)
--- a/Doc/library/binascii.rst
+++ b/Doc/library/binascii.rst
@@ -127,7 +127,7 @@ The :mod:`binascii` module defines the following functions:
    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
index cdd380a88e35c6699e73604665cdd43e9d4169ca..0ed109d028804d85f9a80cb31c4eb584ae291c5b 100644 (file)
--- 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 @@ arguments should be used in most instances.
    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
index 4abb49576d46160afd0829a8a7ffd037e89c7b9f..3eebd850858d8d3db3e1059373df11a278b5b97d 100644 (file)
--- a/Doc/library/carbon.rst
+++ b/Doc/library/carbon.rst
@@ -24,7 +24,7 @@ framework and Qt is in the QuickTime framework. The normal use pattern is ::
 
 .. 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
index f1d9763376066277c5bf485fa8b72cc74c285c63..40b8ce664f7e3d501edb75656d452e9dc5578ba0 100644 (file)
--- 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
index 390b2a693ac92b6948d7ee03bc0a1857e149604f..013ee82546758327e4cc03bebe609fbdb93bb4c6 100644 (file)
--- 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
index 46ff8231a8312e270e4c9d31e902e11df61aa416..0b73e421272b7f13aa219763521329c78029f71e 100644 (file)
--- 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
index 458e65307da4caf464c84a29a1c74ba0fd04a1ca..229bcb22915b8f6583f1bd6b02b1236465507d23 100644 (file)
--- a/Doc/library/compiler.rst
+++ b/Doc/library/compiler.rst
@@ -6,7 +6,7 @@ Python compiler package
 ***********************
 
 .. 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
index 3536f3efb6b34c1381147b4a5c6c9840c9612b22..c72908a3f25432d04b468f0ceb237c4afc422b14 100644 (file)
--- 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
index 52c897579d169496dc9f41b901caea7738be4889..19786f7da22ba18ef1929d13d2b691afd6fa7f6b 100644 (file)
--- 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
index 77d66245a513c362a407ad040570d709582318f6..2ace5100a269ffb4962630d662002eb3771bcb8d 100644 (file)
--- 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
index 609ded045e56b0619ed7626e2f70e788de283c0e..80ccb4b72dc322c3302b076a4f9c24a82900ccd4 100644 (file)
--- 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
index 0b440abba0d2769365f601b83c1f06da0ab5a3f4..ed965e1fd0734b1da933a84d04d7d36111c499c0 100644 (file)
--- 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
index 874778956feffa90ea8994a9ea3fbd1ec938f81a..6f9781e4d49986b7d6b1d73249dad0d5c14928ae 100644 (file)
--- 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
index 71a8abea44c91488f69ffce28361b604b36ac559..632ddd59ca83ff66e2ecbf8ad7e91530cf79512e 100644 (file)
--- 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
index 13510c512e288d1ccf2a8f241cb4c7a5c97abd96..40556cc80990498c03d1a9eed85aa00ee81129cc 100644 (file)
--- 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
index 67cb3b9c5ffefe513573809149d05e1c1a7bc827..08e4e4b8778a52ecdc00eb9a41252e8a10c0cb62 100644 (file)
--- 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
index a511855dd0d5fa571d946cb7184cc4f3d46fb572..965710ab10b8e79c94162895e2246dbfe3f67e7b 100644 (file)
--- 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
index a4dba86bc91187e1cabf572123980892c8233a80..a1d977ddf6d74feb2ddc00ef14c0cd17900e4330 100644 (file)
--- 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
index 540cac9b4fa60cf665649b0385994799f2880a67..c6893729b23418ee163130df437b7d72a30d890a 100644 (file)
--- 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 @@ FORMS objects have these data attributes; see the FORMS documentation:
 
 
 .. 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 @@ source for a complete list of the defined names.  Suggested use::
 
 
 .. 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
index 6bf680889a25d2bd6eb6b792593fa98d21e8e997..c7eb4f3ece5522a263c55fe28ac582f9620ac477 100644 (file)
--- 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
index 3448585609920d44f9c5d49f187155b824f6df78..1713301f557fa0bf2ff35d3fc4963112056abc63 100644 (file)
--- 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
index aec23e6f23f2fae44a0a0e27f5e2af61deb7abd9..742c03595d13f56889e89bb2832ed655c7900c65 100644 (file)
--- 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
index 0d189dca99089fd44d692ec36bcad30ad063c4b2..7ea9cf31a3e8291ade3bf0ba775eab6650c568dc 100644 (file)
--- 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 @@ Here is a tiny but complete example GL program in Python::
 
 
 .. 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 @@ module source file for details.
 
 
 .. 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
index f253d1268ad51dafe55718e6053d735b5be0b7f7..9e68f4596c5d2e87287c43a9da61ef3faf898da9 100644 (file)
--- 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 @@ additional methods and instance variables for use within tag methods.
 .. 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
index f26fba6a6c185fc162f961e2f1b329246bff34ff..0a6968f102b8f487223fc9c0dfea901107cea294 100644 (file)
--- 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
index ceef0c70d0c4a02afdf3834f5e5e86df8569ea4e..e6cb6696f2cc4280bc6f8ca763212c8f482c276d 100644 (file)
--- 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
index 84ede95b28be8c790debddf331fe0fda8b04b122..f4c670f4fea776f36a3e457a3f4c751fedfd6ec5 100644 (file)
--- 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
index 94194e2f72b58247abafb7227c77f30b9231ae08..14d7041ba5a6b903f871a5ba497ea2753259d5ed 100644 (file)
--- 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
index 98497adf8a37eaaffad9310eaa8fa50db4362f0a..2a8e4e85aa8a7fe0c5a96214d796ef1db79b2191 100644 (file)
--- 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
index f2a2643c105b3d2672de72c3d49be6a4c2715ea6..7924669ce0821486a552d2f615e6e231288e5e76 100644 (file)
--- a/Doc/library/macostools.rst
+++ b/Doc/library/macostools.rst
@@ -15,7 +15,7 @@ files, so it should not be used on UFS partitions.
 
 .. 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
index 7e6f44a8d6e57214406c6adcb3d60927b4ec45aa..5cdb683c34e7384666f0476e93283693c1e8f180 100644 (file)
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -1513,7 +1513,7 @@ Older versions of the :mod:`mailbox` module do not support modification of
 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
index 2aab1dc083b7a18eb66d7420d31d237ff41dc16c..939bdc7777c5bd20250bb4822cfaf3371fe8da37 100644 (file)
--- 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
index 2d413500287be046de9011888efa5382bf267618..57c39714347b70f04ef0e180159a2d5fc3100ac0 100644 (file)
--- 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
index 8dd965e9a14a8cb98bb116f504e9f95c08e3cf19..667e586e5df63bd42220644891db2ecd54959259 100644 (file)
--- 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
index 62bbdfff70d0f7f29937e67bda79f681b1a5aaf3..4adc49e30d9d7053ee8b06b88cb54b9deb3444db 100644 (file)
--- a/Doc/library/os.path.rst
+++ b/Doc/library/os.path.rst
@@ -331,7 +331,7 @@ write files see :func:`open`, and for accessing the filesystem see the
 
    .. 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
index c46aeae7ee210ae78929a358d634862f7f8ed02a..554229f38acb52121ef71a9b77edf0cfb424bd1c 100644 (file)
--- a/Doc/library/parser.rst
+++ b/Doc/library/parser.rst
@@ -34,7 +34,7 @@ the code forming the application.  It is also faster.
    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
index 36ff3469362326485419529486e2f3c5e1ec837c..67c5c6f85376de7c071f00e24890ecb5eacb0b37 100644 (file)
--- 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
index 11e6ae20ca78c02a36e73ad58fd11c83db8777eb..a9280bb4312bf6f88b5c57b0331cd312e5dc3fe9 100644 (file)
--- 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
index 2ce612aba7b2ca67d56fe45a5d049fb7cd6e05cb..6b6923c34af22c7162a75044385d8bdfd08c8152 100644 (file)
--- 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
index 8e563ddd1507a13505339491b3708fda153f4930..33aa8519aa9e10ff609e81709d760b8919a4d36d 100644 (file)
--- 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
index ba7e557873beeb6d7d11397410f2878cbb212f08..6f0bf537cf01c665767e25862eeb101a6d70156f 100644 (file)
--- 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
index 5c666c38f376aab5c5779fb7183ca6b7773e4036..6af59dc22d5b1ee340a57eb51cd1dce1873e3706 100644 (file)
--- a/Doc/library/scrolledtext.rst
+++ b/Doc/library/scrolledtext.rst
@@ -16,8 +16,8 @@ as that of the :class:`Tkinter.Text` class.
 .. 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
index f50b02c178ff09937ca6553742910d1b0e940d28..1da19cfb7df999569b75bd26cf19c938deb27dd8 100644 (file)
--- 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
index a92c7c9a59f3578342a03ca991cd94b38164b580..2e7e97ace6d7e11043581dd47817ab11a2435a85 100644 (file)
--- 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
index 3618728ac1eea28453bce1ba4c686e92a1f96512..62139c492198de2699154c078ee1e41577bd75e1 100644 (file)
--- 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
index 62caf2b114fc5bc7f4aa555374e1af94c8776ea9..c34b486806670ea243311d78ebef47b3651a1498 100644 (file)
--- 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
index 748b7f937e13399a1af4991cd823c957ab69b236..6f44b2c600be67b31144fda4f61d9638cfd03ec4 100644 (file)
--- 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
index 2ecdef1acad53e584c6b99c4ccf6dccdd64b4bb2..ad0b5521c346910202a724367b8b6300c84a78fb 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -969,7 +969,7 @@ string functions based on regular expressions.
    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
index 4c3abcd1091abfa2c8820945629e3c13fa7bf46b..c3d1cdce6b77ed6a49829d055992c2dfd4b7c138 100644 (file)
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -793,7 +793,7 @@ Deprecated string functions
 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
index 148eb5e3692d7d0bd484a72677862eeb33258ff7..187204e9e4bae495370d18ad11301a6c0f6456a1 100644 (file)
--- 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 @@ the SIGPOLL signal.  Here's an example of how you might enable this in Python::
    :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
index 691b30cff47fe19e1891272c8f20ee5458b32df3..989e7f48b9ae6e5053e7efa5738a7b3b48232d5c 100644 (file)
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -797,10 +797,10 @@ always available.
 
 .. 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
index b6124e1e40c5a89bd463d179b70452996db73105..6bac65e0f1faee785a8c10e603d82c0e4bebddcc 100644 (file)
--- a/Doc/library/tarfile.rst
+++ b/Doc/library/tarfile.rst
@@ -143,7 +143,7 @@ Some facts and figures:
 
 
    .. 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
index 7e8d5c80d3589ff980825efffe74e46158bc1e0a..15859d1f261440011047c08f6087071a236d27cb 100644 (file)
--- 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
index 8b5355d196dc311326d3e55f909b03f5ae3d2d21..ed68e8178b69d164a781fcdebbc11fccfa67efd8 100644 (file)
--- a/Doc/library/tix.rst
+++ b/Doc/library/tix.rst
@@ -24,9 +24,9 @@ special needs of your application and users.
 
 .. 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
index 3431f869401bc1ec3327d694783f1141ef3d54c3..5f209a9d0d8a01782ec85ead46c6a3ea5e9aeae6 100644 (file)
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -13,9 +13,9 @@ is maintained at ActiveState.)
 
 .. 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 @@ Other modules that provide Tk support include:
 :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
index 1f5d9949bc286f8e1e340a84073fb3161e29a981..2d52f95275df7084b6217bf28722aa028312a0ec 100644 (file)
--- 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 @@ High-level interface
       :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
index 463eb458981d4c3ea6c9daba9c266951c2e46c6b..1121e5fbfce56c0b16ba8879606e1b120b1fcc95 100644 (file)
--- 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
index f118845e8ed64046b00ba6e0d443dd217f6e3442..c8b714503ce06dfe4acda1591fae032350981730 100644 (file)
--- 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
index 920f4296670fc00a0af7b2ddae42b934d299b549..5acd7cee43e314bda836788d9ae5f893cd0cd16d 100644 (file)
--- 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
index 2e14c1204dca8d13f31a4fdddd61feba5c4bd64c..3a19ac1843f7bdb0f4eb4bc5ae54e4c11fa368a9 100644 (file)
--- a/Doc/library/userdict.rst
+++ b/Doc/library/userdict.rst
@@ -114,8 +114,8 @@ The :mod:`UserList` module defines the :class:`UserList` class:
 
    .. 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 @@ The :mod:`UserString` module defines the following classes:
 
    .. 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 @@ The :mod:`UserString` module defines the following classes:
    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
index c74d902446240056e4f8791c6d6827786da4f2b5..0545dbef383cacf391e0758f43c239b249d368dd 100644 (file)
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -419,7 +419,7 @@ Available Context Managers
 
     .. 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
index 7048a0e3550f5ccb4860d1a7e62e448b23ce3c71..3bcb57ccfc10b40b3dc316e62dfd2274663d9c0f 100644 (file)
--- 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
index 183be92a48952df9ec44fd9b80007c83c1cdcfa2..64c67ad274d0b99a65747db4dcfaed40ef3e2c42 100644 (file)
--- 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
index 0d878732477c87dcdd1f471fc1514b6bd812d2ee..d76dc9207b386f06b1e36d92764ad7c37a2673d1 100644 (file)
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -573,7 +573,7 @@ Callable types
          :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 @@ sources of additional information.
    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 @@ Coercion rules
 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
index a7c66d3227c6f1cb515a1967c0180527aea35022..53947a94569cca4eba5bdfd95551bbe65a8f89ea 100644 (file)
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1392,7 +1392,7 @@ groups from right to left).
 
 .. [#] 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