[Python-checkins] r88067 - in python/branches/release31-maint: Objects/typeobject.c
benjamin.peterson
python-checkins at python.org
Mon Jan 17 20:46:49 CET 2011
Author: benjamin.peterson
Date: Mon Jan 17 20:46:48 2011
New Revision: 88067
Log:
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
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Objects/typeobject.c
Modified: python/branches/release31-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release31-maint/Objects/typeobject.c (original)
+++ python/branches/release31-maint/Objects/typeobject.c Mon Jan 17 20:46:48 2011
@@ -2898,7 +2898,7 @@
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 *);
More information about the Python-checkins
mailing list