From: Georg Brandl Date: Mon, 5 Jul 2010 17:50:55 +0000 (+0000) Subject: Merged revisions 82587 via svnmerge from X-Git-Tag: v2.7.1rc1~645 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9273f80982bb228450eddc46eab473989ab03d97;p=python 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 5c6c8eb7a8..eff7ebc1e3 100644 --- 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`.)