diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-01-17 19:48:58 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-01-17 19:48:58 (GMT) |
| commit | cd8500193f93da975feb470865e349d529d55985 (patch) | |
| tree | c3aef29d2c6ddcebf4702a966ad7fa3ad803d9d1 | |
| parent | cf94b8b4da11245baec45a27153804c9f70382f0 (diff) | |
| download | cpython-cd8500193f93da975feb470865e349d529d55985.zip cpython-cd8500193f93da975feb470865e349d529d55985.tar.gz cpython-cd8500193f93da975feb470865e349d529d55985.tar.bz2 | |
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
........
| -rw-r--r-- | Objects/typeobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index baf62ab..e92179c 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -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 *); |