Mercurial > cpython-lru_cache-weakref
changeset 67646:dd87b0efcdd8 2.7
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.
........
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Mon, 17 Jan 2011 19:30:29 +0000 |
| parents | c91de326835e |
| children | 1f6d1418cc18 |
| files | Objects/typeobject.c |
| diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Objects/typeobject.c Sun Jan 16 13:03:37 2011 +0000 +++ b/Objects/typeobject.c Mon Jan 17 19:30:29 2011 +0000 @@ -3011,10 +3011,8 @@ 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 *);