Commits

Ezio Melotti  committed 8aab137

Use Python 3 instead of 3.0.

  • Participants
  • Parent commits e606c12
  • Branches 2.7

Comments (0)

Files changed (76)

File Doc/c-api/buffer.rst

 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`.
 

File Doc/c-api/objbuffer.rst

 
 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.
 

File Doc/c-api/typeobj.rst

 - 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

File Doc/glossary.rst

 
    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

File Doc/howto/sorting.rst

 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:

File Doc/library/2to3.rst

 
    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
 

File Doc/library/_winreg.rst

 .. 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

File Doc/library/al.rst

    :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
    :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

File Doc/library/anydbm.rst

 
 
 .. 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

File Doc/library/basehttpserver.rst

 
 .. 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::

File Doc/library/bastion.rst

    :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>
 

File Doc/library/binascii.rst

    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]

File Doc/library/bsddb.rst

 .. 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
    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::

File Doc/library/carbon.rst

 
 .. 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

File Doc/library/cd.rst

 
 
 .. 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

File Doc/library/cgihttpserver.rst

 
 .. 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

File Doc/library/commands.rst

    :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>

File Doc/library/compiler.rst

 ***********************
 
 .. 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>
 

File Doc/library/configparser.rst

 .. 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

File Doc/library/cookie.rst

 
 .. 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`
 

File Doc/library/cookielib.rst

 
 .. 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
 

File Doc/library/copy_reg.rst

    :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

File Doc/library/dbhash.rst

 .. 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
 

File Doc/library/dbm.rst

    :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

File Doc/library/dircache.rst

    :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>

File Doc/library/dl.rst

    :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>

File Doc/library/docxmlrpcserver.rst

 
 .. 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

File Doc/library/dumbdbm.rst

    :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
 

File Doc/library/dummy_thread.rst

 
 .. 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`

File Doc/library/fl.rst

 
 
 .. 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::
 
 
 .. 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
 
 
 .. 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

File Doc/library/fm.rst

    :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.
 
 
 

File Doc/library/fpformat.rst

    :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>
 

File Doc/library/gdbm.rst

    :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

File Doc/library/gl.rst

 
 
 .. 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
 
 
 .. 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
 
 
 .. 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.

File Doc/library/htmllib.rst

    :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::
 .. 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`
 

File Doc/library/httplib.rst

 
 .. 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::

File Doc/library/imageop.rst

    :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

File Doc/library/imgfile.rst

    :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.
 
 
 

File Doc/library/imputil.rst

    :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

File Doc/library/jpeg.rst

    :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.
 
 
 

File Doc/library/macostools.rst

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

File Doc/library/mailbox.rst

 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:
 

File Doc/library/mhlib.rst

    :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>

File Doc/library/mutex.rst

    :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>
 

File Doc/library/new.rst

    :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>

File Doc/library/os.path.rst

 
    .. 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`.
 
 

File Doc/library/parser.rst

    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

File Doc/library/queue.rst

    :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`
 

File Doc/library/repr.rst

 .. 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`
 

File Doc/library/rexec.rst

    :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.

File Doc/library/rfc822.rst

 .. 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

File Doc/library/robotparser.rst

 
 .. 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

File Doc/library/scrolledtext.rst

 .. 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

File Doc/library/sgmllib.rst

    :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
 

File Doc/library/simplehttpserver.rst

 
 .. 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,

File Doc/library/simplexmlrpcserver.rst

 
 .. 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

File Doc/library/socketserver.rst

 .. 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`
 

File Doc/library/statvfs.rst

    :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>

File Doc/library/stdtypes.rst

    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.
 

File Doc/library/string.rst

 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)

File Doc/library/sunaudio.rst

    :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.
 
 
 
    :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.
 
 
 

File Doc/library/sys.rst

 
 .. 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
 

File Doc/library/tarfile.rst

 
 
    .. 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

File Doc/library/thread.rst

    :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.
 
 

File Doc/library/tix.rst

 
 .. 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::
 

File Doc/library/tkinter.rst

 
 .. 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::
 
 :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.
 
 

File Doc/library/urllib.rst

 
 .. 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
       :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`.
 
 

File Doc/library/urllib2.rst

 
 .. 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

File Doc/library/urlparse.rst

    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`
 

File Doc/library/user.rst

    :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

File Doc/library/userdict.rst

 
    .. 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
 
    .. 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.
 
 
 
    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

File Doc/library/warnings.rst

 
     .. 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

File Doc/library/whichdb.rst

 
 .. 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

File Doc/library/xmlrpclib.rst

 
 .. 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

File Doc/reference/datamodel.rst

          :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::
    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.
 
 
 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.
 
 *

File Doc/reference/expressions.rst

 
 .. [#] 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