diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-10-24 12:52:30 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-10-24 12:52:30 (GMT) |
| commit | b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411 (patch) | |
| tree | f2a6d0d94148c8b98322edcb571928be8a9b8ba0 /Doc | |
| parent | 6a985c3549a8febb934e041601bb1dd20352bb53 (diff) | |
| parent | d6ca6c2b32118fec10d28b1a23d97f8e6b536d04 (diff) | |
| download | cpython-b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411.zip cpython-b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411.tar.gz cpython-b4d8e912d7a9fd2f346aae5038c15f4f1f3dd411.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/2to3.rst | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst index b3efeab..fe1c2be 100644 --- a/Doc/library/2to3.rst +++ b/Doc/library/2to3.rst @@ -123,7 +123,9 @@ and off individually. They are described here in more detail. .. 2to3fixer:: callable Converts ``callable(x)`` to ``isinstance(x, collections.Callable)``, adding - an import to :mod:`collections` if needed. + an import to :mod:`collections` if needed. Note ``callable(x)`` has returned + in Python 3.2, so if you do not intend to support Python 3.1, you can disable + this fixer. .. 2to3fixer:: dict |