Merged revisions 76350 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76350 | benjamin.peterson | 2009-11-17 15:24:54 -0600 (Tue, 17 Nov 2009) | 1 line
a better callable replacement
........
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 87da3c9..1cab40c 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -224,7 +224,7 @@
builtin_callable(PyObject *self, PyObject *v)
{
if (PyErr_WarnPy3k("callable() not supported in 3.x; "
- "use hasattr(o, '__call__')", 1) < 0)
+ "use isinstance(x, collections.Callable)", 1) < 0)
return NULL;
return PyBool_FromLong((long)PyCallable_Check(v));
}