Merged revisions 85154,85182 via svnmerge from
commit9b69a157e390ed6a6c01f15e20358c5b902ffd0e
authorbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Sat, 2 Oct 2010 18:04:55 +0000 (2 18:04 +0000)
committerbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Sat, 2 Oct 2010 18:04:55 +0000 (2 18:04 +0000)
tree16ad47ce794ec54bc1a456c84b61cd8b3569f606
parent0a5a56b2fd5135551561171a00919c58be4b5faa
Merged revisions 85154,85182 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85154 | benjamin.peterson | 2010-10-01 19:03:31 -0500 (Fri, 01 Oct 2010) | 1 line

  type.__abstractmethods__ should raise an AttributeError #10006
........
  r85182 | benjamin.peterson | 2010-10-02 12:55:47 -0500 (Sat, 02 Oct 2010) | 1 line

  add a test and a note about metaclasses now being abcs
........

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@85183 6015fed2-1504-0410-9fe1-9d1591cc4771
Lib/test/test_abc.py
Misc/NEWS
Objects/typeobject.c