[Python-checkins] r88068 - in python/branches/release27-maint: Objects/typeobject.c

Mon Jan 17 20:48:58 CET 2011

Author: benjamin.peterson
Date: Mon Jan 17 20:48:58 2011
New Revision: 88068
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 (2011年1月17日) | 1 line
 
 correct assertion
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Objects/typeobject.c
Modified: python/branches/release27-maint/Objects/typeobject.c
==============================================================================

--- python/branches/release27-maint/Objects/typeobject.c	(original)
+++ python/branches/release27-maint/Objects/typeobject.c	Mon Jan 17 20:48:58 2011
@@ -3012,7 +3012,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 *);
