Skip to content

Commit fd3deb6

Browse files
author
benjamin.peterson
committed
a few edits and typos
git-svn-id: http://svn.python.org/projects/python/trunk@69442 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent 120a18d commit fd3deb6

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

Doc/library/2to3.rst

+11-10
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ and off individually. They are described here in more detail.
146146
147147
.. 2to3fixer:: filter
148148
149-
Wraps :func:`filter` in a :class:`list` call.
149+
Wraps :func:`filter` usage in a :class:`list` call.
150150
151151
.. 2to3fixer:: funcattrs
152152
@@ -190,16 +190,16 @@ and off individually. They are described here in more detail.
190190
191191
.. 2to3fixer:: imports2
192192
193-
Handles other modules reanmes in the standard library. It is separate from
194-
:2to3fixer:`imports` only because of technical limitations.
193+
Handles other modules renames in the standard library. It is separate from
194+
the :2to3fixer:`imports` fixer only because of technical limitations.
195195
196196
.. 2to3fixer:: input
197197
198198
Converts ``input(prompt)`` to ``eval(input(prompt))``
199199
200200
.. 2to3fixer:: intern
201201
202-
Converts :func:`intern` to :func:`sys.itern`.
202+
Converts :func:`intern` to :func:`sys.intern`.
203203
204204
.. 2to3fixer:: isinstance
205205
@@ -221,11 +221,12 @@ and off individually. They are described here in more detail.
221221
222222
.. 2to3fixer:: long
223223
224-
Strips the ``L`` prefix on numbers and renamed :class:`long` to :class:`int`.
224+
Strips the ``L`` prefix on long literals and renames :class:`long` to
225+
:class:`int`.
225226
226227
.. 2to3fixer:: map
227228
228-
Wraps :func:`map` in a :class:`list` call. It also changes ``map(none, x)``
229+
Wraps :func:`map` in a :class:`list` call. It also changes ``map(None, x)``
229230
to ``list(x)``. Using ``from future_builtins import map`` disables this
230231
fixer.
231232
@@ -259,15 +260,15 @@ and off individually. They are described here in more detail.
259260
.. 2to3fixer:: paren
260261
261262
Add extra parenthesis where they are required in list comprehensions. For
262-
example, ``[x for x in 1, 2]`` to ``[x for x in (1, 2)]``.
263+
example, ``[x for x in 1, 2]`` becomes ``[x for x in (1, 2)]``.
263264
264265
.. 2to3fixer:: print
265266
266267
Converts the :keyword:`print` statement to the :func:`print` function.
267268
268269
.. 2to3fixer:: raises
269270
270-
Converts ``raise E, V`` to ``raise E(V)``, and ``raise E, V, T`` as ``raise
271+
Converts ``raise E, V`` to ``raise E(V)``, and ``raise E, V, T`` to ``raise
271272
E(V).with_traceback(T)``. If ``E`` is a tuple, the translation will be
272273
incorrect because substituting tuples for exceptions has been removed in 3.0.
273274
@@ -303,7 +304,7 @@ and off individually. They are described here in more detail.
303304
304305
.. 2to3fixer:: throw
305306
306-
Fixes the API change in generators :meth:`throw` method.
307+
Fixes the API change in generator's :meth:`throw` method.
307308
308309
.. 2to3fixer:: tuple_params
309310
@@ -336,7 +337,7 @@ and off individually. They are described here in more detail.
336337
337338
.. 2to3fixer:: xreadlines
338339
339-
Change ``for x in file.xreadlines()`` to ``for x in file``.
340+
Changes ``for x in file.xreadlines()`` to ``for x in file``.
340341
341342
.. 2to3fixer:: zip
342343

0 commit comments

Comments
 (0)