From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 3 Oct 2009 15:14:28 +0000 (+0000)
Subject: Merged revisions 75212,75214 via svnmerge from
X-Git-Tag: v3.1.2rc1~468
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99089c30f8ad3a15e483932a2ba52bfdd35d365f;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index 2ba635ae4b15..b79ce7f195fb 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.