summaryrefslogtreecommitdiffstats
path: root/Doc/library/2to3.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-10-24 12:51:15 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-10-24 12:51:15 (GMT)
commitd6ca6c2b32118fec10d28b1a23d97f8e6b536d04 (patch)
treef89229031b4491fe8cb017395455fb6ba859b1ba /Doc/library/2to3.rst
parentc45fb25fba9ef8a1d322099db86be98775d37bec (diff)
downloadcpython-d6ca6c2b32118fec10d28b1a23d97f8e6b536d04.zip
cpython-d6ca6c2b32118fec10d28b1a23d97f8e6b536d04.tar.gz
cpython-d6ca6c2b32118fec10d28b1a23d97f8e6b536d04.tar.bz2
note callable is back in 3.2
Diffstat (limited to 'Doc/library/2to3.rst')
-rw-r--r--Doc/library/2to3.rst4
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