diff options
author | Benjamin Peterson <benjamin@python.org> | 2008-10-22 20:57:43 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2008-10-22 20:57:43 (GMT) |
commit | 92be53911d9d0a9bfbcd5dac12a64f1e9a206aea (patch) | |
tree | b499d23eb8833cbb5cddea1ea5f7cbc57f9636a9 /Doc/library/2to3.rst | |
parent | e4dc175474a0b688074e221d6ae49a918096c129 (diff) | |
download | cpython-92be53911d9d0a9bfbcd5dac12a64f1e9a206aea.zip cpython-92be53911d9d0a9bfbcd5dac12a64f1e9a206aea.tar.gz cpython-92be53911d9d0a9bfbcd5dac12a64f1e9a206aea.tar.bz2 |
fix a few typos
Diffstat (limited to 'Doc/library/2to3.rst')
-rw-r--r-- | Doc/library/2to3.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst index 9852821..8321080 100644 --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -54,7 +54,7 @@ Comments and and exact indentation are preserved throughout the translation process. By default, 2to3 runs a set of predefined fixers. The :option:`-l` flag lists -all avaible fixers. An explicit set of fixers to run can be given with +all available fixers. An explicit set of fixers to run can be given with :option:`-f`. Likewise the :option:`-x` explicitly disables a fixer. The following example runs only the ``imports`` and ``has_key`` fixers:: @@ -64,7 +64,7 @@ This command runs every fixer except the ``apply`` fixer:: $ 2to3 -x apply example.py -Some fixers are *explicit*, meaning they aren't run be default and must be +Some fixers are *explicit*, meaning they aren't run by default and must be listed on the command line to be run. Here, in addition to the default fixers, the ``idioms`` fixer is run:: @@ -72,10 +72,10 @@ the ``idioms`` fixer is run:: Notice how passing ``all`` enables all default fixers. -Sometimes 2to3 will find will find a place in your source code that needs to be -changed, but 2to3 cannot fix automatically. In this case, 2to3 will print a -warning beneath the diff for a file. You should address the warning in order to -have compliant 3.x code. +Sometimes 2to3 will find a place in your source code that needs to be changed, +but 2to3 cannot fix automatically. In this case, 2to3 will print a warning +beneath the diff for a file. You should address the warning in order to have +compliant 3.x code. 2to3 can also refactor doctests. To enable this mode, use the :option:`-d` flag. Note that *only* doctests will be refactored. This also doesn't require @@ -89,7 +89,7 @@ When the :option:`-p` is passed, 2to3 treats ``print`` as a function instead of a statement. This is useful when ``from __future__ import print_function`` is being used. If this option is not given, the print fixer will surround print calls in an extra set of parentheses because it cannot differentiate between the -and print statement with parentheses (such as ``print ("a" + "b" + "c")``) and a +print statement with parentheses (such as ``print ("a" + "b" + "c")``) and a true function call. |