diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-01-17 20:03:01 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-01-17 20:03:01 (GMT) |
| commit | 32a8fe8b563eb4e1914eac7652fb7ecf56affee9 (patch) | |
| tree | 1998d5273cfe344c13bb36fd3e88dd403876f3a8 | |
| parent | d82f45b72099543dc7bb43bd62bbfd27f624b1ed (diff) | |
| download | cpython-32a8fe8b563eb4e1914eac7652fb7ecf56affee9.zip cpython-32a8fe8b563eb4e1914eac7652fb7ecf56affee9.tar.gz cpython-32a8fe8b563eb4e1914eac7652fb7ecf56affee9.tar.bz2 | |
Merged revisions 88069 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r88069 | benjamin.peterson | 2011-01-17 13:54:55 -0600 (Mon, 17 Jan 2011) | 1 line
remove unneeded assertion
........
| -rw-r--r-- | Objects/typeobject.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index cda5170..caa405b 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2898,7 +2898,6 @@ 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)); size = base->tp_basicsize; if (a->tp_dictoffset == size && b->tp_dictoffset == size) size += sizeof(PyObject *); |