Merged revisions 81417 via svnmerge from
commit6a48923bd6db33d4e80d148888a28b4fa4cf0f41
authorbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Fri, 21 May 2010 21:05:45 +0000 (21 21:05 +0000)
committerbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Fri, 21 May 2010 21:05:45 +0000 (21 21:05 +0000)
tree750f5204037efb90624beeddf9d12dcf40f55ab3
parente9a92ef53fcdfd3a2b4e915621cc7626935ef89d
Merged revisions 81417 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81417 | benjamin.peterson | 2010-05-21 15:55:22 -0500 (Fri, 21 May 2010) | 9 lines

  Merged revisions 81414 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81414 | benjamin.peterson | 2010-05-21 15:51:45 -0500 (Fri, 21 May 2010) | 1 line

    return NotImplemented from Mapping when comparing to a non-mapping #8729
  ........
................

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@81426 6015fed2-1504-0410-9fe1-9d1591cc4771
Lib/_abcoll.py
Lib/test/test_collections.py
Misc/NEWS