From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 28 Dec 2009 20:51:17 +0000 (+0000)
Subject: document new fix_callable behavior
X-Git-Tag: v2.7a2~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d19eaf1eb1d4c110d4ec6826a5b30343b63e7e6;p=thirdparty%2FPython%2Fcpython.git

document new fix_callable behavior
---

diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
index d9eb00c277f6..20a6245dc656 100644
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -122,7 +122,8 @@ and off individually.  They are described here in more detail.
 
 .. 2to3fixer:: callable
 
-   Converts ``callable(x)`` to ``hasattr(x, "__call_")``.
+   Converts ``callable(x)`` to ``isinstance(x, collections.Callable)``, adding
+   an import to :mod:`collections` if needed.
 
 .. 2to3fixer:: dict