]> granicus.if.org Git - python/commitdiff
Merged revisions 88069 via svnmerge from
authorBenjamin Peterson <benjamin@python.org>
Mon, 17 Jan 2011 20:03:01 +0000 (20:03 +0000)
committerBenjamin Peterson <benjamin@python.org>
Mon, 17 Jan 2011 20:03:01 +0000 (20:03 +0000)
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
........

Objects/typeobject.c

index cda517024a62ee26bcf2b29639c2d8c11568b655..caa405b9455ba1ecf32de1d2f658c80e8c58158a 100644 (file)
@@ -2898,7 +2898,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 *);