tree fe5884264509b8e78ff17755cc1a2cbf31d22838
parent 6b29c0147b964e6afa6a09bb8d694bafc30cf7ad
author Guido van Rossum <guido@python.org> 1045596142 +0000
committer Guido van Rossum <guido@python.org> 1045596142 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4031473

The recent changes to super(), in particular supercheck(), broke when
using super() for an instance in a metaclass situation.  Because the
class was a metaclass, the instance was a class, and hence the
PyType_Check() branch was taken.  But this branch didn't apply.  Make
it so that if this branch doesn't apply, the other branch is still
tried.  All tests pass.