Merged revisions 88066 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88066 | benjamin.peterson | 2011-01-17 13:44:46 -0600 (Mon, 17 Jan 2011) | 1 line correct assertion ........
This commit is contained in:
parent
acd17591f5
commit
d82f45b720
|
@ -2898,7 +2898,7 @@ same_slots_added(PyTypeObject *a, PyTypeObject *b)
|
|||
PyObject *slots_a, *slots_b;
|
||||
|
||||
assert(base == b->tp_base);
|
||||
assert(equiv_structs(a, base) && equiv_structs(b, 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