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. ........
This commit is contained in:
parent
1f3fa04543
commit
acd17591f5
|
@ -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 *);
|
||||
|
|
Loading…
Reference in New Issue