[Python-checkins] r76350 - python/trunk/Python/bltinmodule.c

benjamin.peterson python-checkins at python.org
Tue Nov 17 22:24:54 CET 2009


Author: benjamin.peterson
Date: Tue Nov 17 22:24:54 2009
New Revision: 76350

Log:
a better callable replacement

Modified:
   python/trunk/Python/bltinmodule.c

Modified: python/trunk/Python/bltinmodule.c
==============================================================================
--- python/trunk/Python/bltinmodule.c	(original)
+++ python/trunk/Python/bltinmodule.c	Tue Nov 17 22:24:54 2009
@@ -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));
 }


More information about the Python-checkins mailing list