Merged revisions 88069 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88069 | benjamin.peterson | 2011-01-17 13:54:55 -0600 (Mon, 17 Jan 2011) | 1 line

  remove unneeded assertion
........

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index e92179c04a028d3347d93fd1a460cfcf6ac788c7..66d6dca574f95d8ffb85172c2bc8a5063d8833aa 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3012,7 +3012,6 @@ same_slots_added(PyTypeObject *a, PyTypeObject *b)
     PyObject *slots_a, *slots_b;
 
     assert(base == b->tp_base);
-    assert(!equiv_structs(a, base) && !equiv_structs(b, base));
     size = base->tp_basicsize;
     if (a->tp_dictoffset == size && b->tp_dictoffset == size)
         size += sizeof(PyObject *);