From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 17 Jan 2011 20:03:01 +0000 (+0000)
Subject: Merged revisions 88069 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32a8fe8b563eb4e1914eac7652fb7ecf56affee9;p=python

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 cda517024a..caa405b945 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -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 *);