This commit is contained in:
Georg Brandl 2009-03-13 19:04:40 +00:00
parent f87e04d339
commit ae2dbe2543
15 changed files with 27 additions and 27 deletions

View file

@ -99,7 +99,7 @@ differentiate between the print statement with parentheses (such as ``print
Fixers
------
Each step of tranforming code is encapsulated in a fixer. The command ``2to3
Each step of transforming code is encapsulated in a fixer. The command ``2to3
-l`` lists them. As :ref:`documented above <2to3-using>`, each can be turned on
and off individually. They are described here in more detail.
@ -167,11 +167,11 @@ and off individually. They are described here in more detail.
.. 2to3fixer:: idioms
This optional fixer preforms several transformations that make Python code
more idiomatic. Type comparisions like ``type(x) is SomeClass`` and
This optional fixer performs several transformations that make Python code
more idiomatic. Type comparisons like ``type(x) is SomeClass`` and
``type(x) == SomeClass`` are converted to ``isinstance(x, SomeClass)``.
``while 1`` becomes ``while True``. This fixer also tries to make use of
:func:`sorted` in appropiate places. For example, this block ::
:func:`sorted` in appropriate places. For example, this block ::
L = list(some_iterable)
L.sort()

View file

@ -265,12 +265,12 @@ algorithms implemented in this module in other circumstances.
.. function:: parse_qs(qs[, keep_blank_values[, strict_parsing]])
This function is deprecated in this module. Use :func:`urllib.parse.parse_qs`
instead. It is maintained here only for backward compatiblity.
instead. It is maintained here only for backward compatibility.
.. function:: parse_qsl(qs[, keep_blank_values[, strict_parsing]])
This function is deprecated in this module. Use :func:`urllib.parse.parse_qs`
instead. It is maintained here only for backward compatiblity.
instead. It is maintained here only for backward compatibility.
.. function:: parse_multipart(fp, pdict)

View file

@ -53,7 +53,7 @@ The following exceptions are only used as base classes for other exceptions.
The base class for all built-in exceptions. It is not meant to be directly
inherited by user-defined classes (for that use :exc:`Exception`). If
:func:`str` or :func:`unicode` is called on an instance of this class, the
representation of the argument(s) to the instance are returned or the emptry
representation of the argument(s) to the instance are returned or the empty
string when there were no arguments. All arguments are stored in :attr:`args`
as a tuple.

View file

@ -78,9 +78,9 @@ Functions
The :func:`import_module` function acts as a simplifying wrapper around
:func:`__import__`. This means all semantics of the function are derived
from :func:`__import__`, including requiring the package where an import is
occuring from to already be imported (i.e., *package* must already be
imported).
from :func:`__import__`, including requiring the package from which an
import is occurring to have been previously imported (i.e., *package*
must already be imported).
:mod:`importlib.abc` -- Abstract base classes related to import
---------------------------------------------------------------

View file

@ -473,13 +473,13 @@ objects. [#]_
Although powerful, implementing :meth:`__reduce__` directly in your classes is
error prone. For this reason, class designers should use the high-level
interface (i.e., :meth:`__getnewargs__`, :meth:`__getstate__` and
:meth:`__setstate__`) whenever possible. We will show however cases where using
:meth:`__setstate__`) whenever possible. We will show, however, cases where using
:meth:`__reduce__` is the only option or leads to more efficient pickling or
both.
The interface is currently defined as follow. The :meth:`__reduce__` method
The interface is currently defined as follows. The :meth:`__reduce__` method
takes no argument and shall return either a string or preferably a tuple (the
returned object is often refered as the "reduce value").
returned object is often referred to as the "reduce value").
If a string is returned, the string should be interpreted as the name of a
global variable. It should be the object's local name relative to its module;

View file

@ -16,7 +16,7 @@ those found in Perl. The :mod:`re` module is always available.
Both patterns and strings to be searched can be Unicode strings as well as
8-bit strings. However, Unicode strings and 8-bit strings cannot be mixed:
that is, you cannot match an Unicode string with a byte pattern or
vice-versa; similarly, when asking for a substition, the replacement
vice-versa; similarly, when asking for a substitution, the replacement
string must be of the same type as both the pattern and the search string.
Regular expressions use the backslash character (``'\'``) to indicate

View file

@ -139,7 +139,7 @@ scrollbar.
+----------------+---------------------------------------------------------+
| option | description |
+================+=========================================================+
| xscrollcommand | Used to comunicate with horizontal scrollbars. |
| xscrollcommand | Used to communicate with horizontal scrollbars. |
| | |
| | When the view in the widget's window change, the widget |
| | will generate a Tcl command based on the scrollcommand. |
@ -149,7 +149,7 @@ scrollbar.
| | the scrollbar to be updated whenever the view in the |
| | window changes. |
+----------------+---------------------------------------------------------+
| yscrollcommand | Used to comunicate with vertical scrollbars. |
| yscrollcommand | Used to communicate with vertical scrollbars. |
| | For some more information, see above. |
+----------------+---------------------------------------------------------+

View file

@ -82,7 +82,7 @@ function it uses to do this is available:
.. function:: detect_encoding(readline)
The :func:`detect_encoding` function is used to detect the encoding that
should be used to decode a Python source file. It requires one argment,
should be used to decode a Python source file. It requires one argument,
readline, in the same way as the :func:`tokenize` generator.
It will call readline a maximum of twice, and return the encoding used

View file

@ -61,7 +61,7 @@ The object-oriented interface uses essentially two+two classes:
The procedural interface provides functions which are derived from the methods
of the classes :class:`Screen` and :class:`Turtle`. They have the same names as
the corresponding methods. A screen object is automativally created whenever a
the corresponding methods. A screen object is automatically created whenever a
function derived from a Screen method is called. An (unnamed) turtle object is
automatically created whenever any of the functions derived from a Turtle method
is called.
@ -1584,7 +1584,7 @@ The public classes of the module :mod:`turtle`
=========== ===========
"polygon" a polygon-tuple, i.e. a tuple of pairs of coordinates
"image" an image (in this form only used internally!)
"compound" ``None`` (a compund shape has to be constructed using the
"compound" ``None`` (a compound shape has to be constructed using the
:meth:`addcomponent` method)
=========== ===========
@ -1806,7 +1806,7 @@ There is a set of demo scripts in the turtledemo directory located in the
It contains:
- a set of 15 demo scripts demonstrating differet features of the new module
- a set of 15 demo scripts demonstrating different features of the new module
:mod:`turtle`
- a demo viewer :file:`turtleDemo.py` which can be used to view the sourcecode
of the scripts and run them at the same time. 14 of the examples can be