merge 3.2

This commit is contained in:
Benjamin Peterson 2011-10-24 08:52:30 -04:00
commit b4d8e912d7
1 changed files with 3 additions and 1 deletions

View File

@ -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