traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use Python 3 instead of 3.0.

This commit is contained in:
Ezio Melotti 2012-05-03 19:21:40 +03:00
parent e5d3bc4700
commit 510ff54324
76 changed files with 125 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/c-api/buffer.rst
View File

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

2
Doc/c-api/objbuffer.rst
View File

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

2
Doc/c-api/typeobj.rst
View File

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

2
Doc/glossary.rst
View File

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

4
Doc/howto/sorting.rst
View File

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

2
Doc/library/2to3.rst
View File

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

4
Doc/library/_winreg.rst
View File

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

4
Doc/library/al.rst
View File

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

4
Doc/library/anydbm.rst
View File

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

4
Doc/library/basehttpserver.rst
View File

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

2
Doc/library/bastion.rst
View File

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

2
Doc/library/binascii.rst
View File

@ -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]

4
Doc/library/bsddb.rst
View File

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

2
Doc/library/carbon.rst
View File

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

2
Doc/library/cd.rst
View File

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

4
Doc/library/cgihttpserver.rst
View File

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

2
Doc/library/commands.rst
View File

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

2
Doc/library/compiler.rst
View File

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

4
Doc/library/configparser.rst
View File

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

4
Doc/library/cookie.rst
View File

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

4
Doc/library/cookielib.rst
View File

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

4
Doc/library/copy_reg.rst
View File

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

2
Doc/library/dbhash.rst
View File

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

4
Doc/library/dbm.rst
View File

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

2
Doc/library/dircache.rst
View File

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

2
Doc/library/dl.rst
View File

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

4
Doc/library/docxmlrpcserver.rst
View File

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

4
Doc/library/dumbdbm.rst
View File

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

4
Doc/library/dummy_thread.rst
View File

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

6
Doc/library/fl.rst
View File

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

2
Doc/library/fm.rst
View File

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

2
Doc/library/fpformat.rst
View File

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

4
Doc/library/gdbm.rst
View File

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

6
Doc/library/gl.rst
View File

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

6
Doc/library/htmllib.rst
View File

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

4
Doc/library/httplib.rst
View File

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

2
Doc/library/imageop.rst
View File

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

2
Doc/library/imgfile.rst
View File

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

2
Doc/library/imputil.rst
View File

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

2
Doc/library/jpeg.rst
View File

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

2
Doc/library/macostools.rst
View File

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

2
Doc/library/mailbox.rst
View File

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

2
Doc/library/mhlib.rst
View File

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

2
Doc/library/mutex.rst
View File

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

2
Doc/library/new.rst
View File

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

2
Doc/library/os.path.rst
View File

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

2
Doc/library/parser.rst
View File

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

4
Doc/library/queue.rst
View File

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

4
Doc/library/repr.rst
View File

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

2
Doc/library/rexec.rst
View File

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

2
Doc/library/rfc822.rst
View File

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

4
Doc/library/robotparser.rst
View File

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

4
Doc/library/scrolledtext.rst
View File

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

2
Doc/library/sgmllib.rst
View File

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

4
Doc/library/simplehttpserver.rst
View File

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

4
Doc/library/simplexmlrpcserver.rst
View File

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

4
Doc/library/socketserver.rst
View File

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

2
Doc/library/statvfs.rst
View File

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

2
Doc/library/stdtypes.rst
View File

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

2
Doc/library/string.rst
View File

@ -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)

4
Doc/library/sunaudio.rst
View File

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

4
Doc/library/sys.rst
View File

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

2
Doc/library/tarfile.rst
View File

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

4
Doc/library/thread.rst
View File

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

4
Doc/library/tix.rst
View File

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

6
Doc/library/tkinter.rst
View File

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

8
Doc/library/urllib.rst
View File

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

4
Doc/library/urllib2.rst
View File

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

4
Doc/library/urlparse.rst
View File

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

2
Doc/library/user.rst
View File

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

10
Doc/library/userdict.rst
View File

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

2
Doc/library/warnings.rst
View File

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

4
Doc/library/whichdb.rst
View File

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

4
Doc/library/xmlrpclib.rst
View File

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

6
Doc/reference/datamodel.rst
View File

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

2
Doc/reference/expressions.rst
View File

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