diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-01-17 19:36:44 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-01-17 19:36:44 (GMT) |
| commit | acd17591f5d4a41106f62008bab5ea14d4b216da (patch) | |
| tree | 4fdb270aca7d304b3cb57d7c0878433c1d3df9b6 | |
| parent | 1f3fa04543aa3061da72ae1e40526391b1c26910 (diff) | |
| download | cpython-acd17591f5d4a41106f62008bab5ea14d4b216da.zip cpython-acd17591f5d4a41106f62008bab5ea14d4b216da.tar.gz cpython-acd17591f5d4a41106f62008bab5ea14d4b216da.tar.bz2 | |
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.
........
| -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 7a82393..974a402 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 *); |