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
........

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index baf62ab52781f071c6a703cf69a6ecad81786c6f..e92179c04a028d3347d93fd1a460cfcf6ac788c7 100644 (file)
--- 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 *);