From cf94b8b4da11245baec45a27153804c9f70382f0 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 17 Jan 2011 19:30:29 +0000 Subject: [PATCH] Merged revisions 88063 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88063 | benjamin.peterson | 2011-01-17 13:24:34 -0600 (Mon, 17 Jan 2011) | 4 lines turn some checks into assertions, since they are implied by the caller Reviewed by Georg. ........ --- Objects/typeobject.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 394b962c179..baf62ab5278 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3011,10 +3011,8 @@ same_slots_added(PyTypeObject *a, PyTypeObject *b) Py_ssize_t size; PyObject *slots_a, *slots_b; - if (base != b->tp_base) - return 0; - if (equiv_structs(a, base) && equiv_structs(b, base)) - return 1; + 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 *);