Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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:
Benjamin Peterson 2011-01-17 19:48:58 +00:00
parent cf94b8b4da
commit cd8500193f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Objects/typeobject.c
View File

@ -3012,7 +3012,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 *);