[Python-checkins] r75215 - in python/branches/release31-maint: Doc/whatsnew/3.0.rst

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Oct  3 17:14:28 2009
New Revision: 75215

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/whatsnew/3.0.rst

Modified: python/branches/release31-maint/Doc/whatsnew/3.0.rst
==============================================================================
--- python/branches/release31-maint/Doc/whatsnew/3.0.rst	(original)
+++ python/branches/release31-maint/Doc/whatsnew/3.0.rst	Sat Oct  3 17:14:28 2009
@@ -804,8 +804,8 @@
   ``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.