Merged revisions 82587 via svnmerge from

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

........
  r82587 | georg.brandl | 2010-07-05 19:48:38 +0200 (Mo, 05 Jul 2010) | 1 line

  #9166: NotImplemented is not an exception.
........

diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 5c6c8eb7a88a56455a4447fcb89b07518ccdce67..eff7ebc1e32020210e8a73403cc690230372d9a9 100644 (file)
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -1073,7 +1073,7 @@ changes, or look through the Subversion logs for all the details.
   (Added by Raymond Hettinger; :issue:`1818`.)
 
   Finally, the :class:`~collections.Mapping` abstract base class now
-  raises a :exc:`NotImplemented` exception if a mapping is compared to
+  returns :const:`NotImplemented` if a mapping is compared to
   another type that isn't a :class:`Mapping`.
   (Fixed by Daniel Stutzbach; :issue:`8729`.)