From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 17 Nov 2009 21:33:08 +0000 (+0000)
Subject: Merged revisions 76350 via svnmerge from
X-Git-Tag: v2.6.5rc1~347
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0811a44ccaefeb1e95813aa7524fe1a885f4d86c;p=python

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 87da3c9fff..1cab40c049 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -224,7 +224,7 @@ static PyObject *
 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));
 }