[Python-checkins] r82588 - in python/branches/release27-maint: Doc/whatsnew/2.7.rst

[georg.brandl]

Author: georg.brandl
Date: Mon Jul  5 19:50:55 2010
New Revision: 82588

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/whatsnew/2.7.rst

Modified: python/branches/release27-maint/Doc/whatsnew/2.7.rst
==============================================================================
--- python/branches/release27-maint/Doc/whatsnew/2.7.rst	(original)
+++ python/branches/release27-maint/Doc/whatsnew/2.7.rst	Mon Jul  5 19:50:55 2010
@@ -1073,7 +1073,7 @@
   (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`.)