Merged revisions 75090 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r75090 | benjamin.peterson | 2009-09-27 11:32:56 -0500 (Sun, 27 Sep 2009) | 1 line

  use more correct callable replacement
........

diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst
index 943457312f635eb6361741d8b0e7c377e73f3b2c..2ba635ae4b15500cb8fcfa4269ebcc7680803a85 100644 (file)
--- 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(f, '__call__')``.  The :func:`operator.isCallable` function
-  is also gone.
+  ``hasattr(type(f), '__call__')``.  The :func:`operator.isCallable` function is
+  also gone.
 
 * Removed :func:`coerce`.  This function no longer serves a purpose
   now that classic classes are gone.