From fba33478a5af3da448ca363626ab451ffc1aef6c Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 17 Jan 2011 19:57:01 +0000 Subject: [PATCH] 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 ........ --- Objects/typeobject.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index e92179c04a..66d6dca574 100644 --- 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 *); -- 2.50.1