diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-10-03 15:14:28 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-10-03 15:14:28 (GMT) |
| commit | 99089c30f8ad3a15e483932a2ba52bfdd35d365f (patch) | |
| tree | 7aef28189f5885ced58bc6de809bde35b5d18460 | |
| parent | 149953afb89bc360c585c612d207c6cece451e22 (diff) | |
| download | cpython-99089c30f8ad3a15e483932a2ba52bfdd35d365f.zip cpython-99089c30f8ad3a15e483932a2ba52bfdd35d365f.tar.gz cpython-99089c30f8ad3a15e483932a2ba52bfdd35d365f.tar.bz2 | |
Merged revisions 75212,75214 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r75212 | benjamin.peterson | 2009-10-03 10:06:21 -0500 (Sat, 03 Oct 2009) | 1 line
revert r75090
........
r75214 | benjamin.peterson | 2009-10-03 10:13:15 -0500 (Sat, 03 Oct 2009) | 1 line
isinstance(f, collections.Callable) is more correct
........
| -rw-r--r-- | Doc/whatsnew/3.0.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst index 2ba635a..b79ce7f 100644 --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -804,8 +804,8 @@ Builtins ``f(*args)``. * Removed :func:`callable`. Instead of ``callable(f)`` you can use - ``hasattr(type(f), '__call__')``. The :func:`operator.isCallable` function is - also gone. + ``isinstance(f, collections.Callable)``. The :func:`operator.isCallable` + function is also gone. * Removed :func:`coerce`. This function no longer serves a purpose now that classic classes are gone. |