tree ddccff20e1c079a0c40b1cb7751fe357cd5f64cf
parent f24b2f32850625dc56d510e2a5d019641bd06b4e
author Guido van Rossum <guido@python.org> 997478648 +0000
committer Guido van Rossum <guido@python.org> 997478648 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4022360

- Big changes to fix SF bug #442833 (a nasty multiple inheritance
  problem).  inherit_slots() is split in two parts: inherit_special()
  which inherits the flags and a few very special members from the
  dominant base; inherit_slots() which inherits only regular slots,
  and is now called for each base in the MRO in turn.  These are now
  both void functions since they don't have error returns.

- Added object.__setitem__() back -- for the same reason as
  object.__new__(): a subclass of object should be able to call
  object.__new__().

- add_wrappers() was moved around to be closer to where it is used (it
  was defined together with add_methods() etc., but has nothing to do
  with these).