Author: benjamin.peterson Date: Sun Sep 27 18:42:15 2009 New Revision: 75094 Log: 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 ........ 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 Sun Sep 27 18:42:15 2009 @@ -804,8 +804,8 @@ ``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.