From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 17 Jan 2011 19:36:44 +0000 (+0000)
Subject: Merged revisions 88063 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=acd17591f5d4a41106f62008bab5ea14d4b216da;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 7a823933568b..974a4029e06e 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2897,10 +2897,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 *);