[Python-checkins] r76353 - in python/branches/release26-maint: Python/bltinmodule.c

Tue Nov 17 22:33:08 CET 2009

Author: benjamin.peterson
Date: Tue Nov 17 22:33:08 2009
New Revision: 76353
Log:
Merged revisions 76350 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r76350 | benjamin.peterson | 2009年11月17日 15:24:54 -0600 (2009年11月17日) | 1 line
 
 a better callable replacement
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Python/bltinmodule.c
Modified: python/branches/release26-maint/Python/bltinmodule.c
==============================================================================

--- python/branches/release26-maint/Python/bltinmodule.c	(original)
+++ python/branches/release26-maint/Python/bltinmodule.c	Tue Nov 17 22:33:08 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));
 }
