diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-01-17 19:57:01 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-01-17 19:57:01 +0000 |
| commit | 72d1c64cb88ae8bcfc51facd233b583ddd83732f (patch) | |
| tree | 53204af2116724a5208d60ea9a06674d55f7210c /Objects | |
| parent | fea8794f8dc465998d5fd1de15cf558d59bdbc1a (diff) | |
| download | cpython-72d1c64cb88ae8bcfc51facd233b583ddd83732f.tar.gz | |
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
........
Diffstat (limited to 'Objects')
| -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 e92179c04a..66d6dca574 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3012,7 +3012,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 *); |