diff options
author | Benjamin Peterson <benjamin@python.org> | 2011-01-17 19:36:44 +0000 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2011-01-17 19:36:44 +0000 |
commit | d18237fef179376a85e7d0f0cb0006aee3a663de (patch) | |
tree | fee72a2d67d9e123666ef0ca75bc82a9a2a67904 /Objects | |
parent | eeddb817e7db09b0a2f2c689301fbe1ac6d92978 (diff) | |
download | cpython-d18237fef179376a85e7d0f0cb0006aee3a663de.tar.gz |
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.
........
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/typeobject.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 7a82393356..974a4029e0 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 *); |