diff options
author | Benjamin Peterson <benjamin@python.org> | 2009-11-17 21:33:08 +0000 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2009-11-17 21:33:08 +0000 |
commit | 0811a44ccaefeb1e95813aa7524fe1a885f4d86c (patch) | |
tree | 7e61649bae87e249167d08f93c5e7a5de2d5e722 /Python/bltinmodule.c | |
parent | 577e370709ab7498f9eb8c7f78fe056cbbaf8ddb (diff) | |
download | cpython-git-0811a44ccaefeb1e95813aa7524fe1a885f4d86c.tar.gz |
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
........
Diffstat (limited to 'Python/bltinmodule.c')
-rw-r--r-- | Python/bltinmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)); } |