merge 3.2

benjaminp · benjaminp · commit b4d8e912d7a9 · 2011-10-24T08:52:30.000-04:00
diff --git 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
 
