From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 17 Jan 2011 19:46:48 +0000 (+0000)
Subject: Merged revisions 88066 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d82f45b72099543dc7bb43bd62bbfd27f624b1ed;p=thirdparty%2FPython%2Fcpython.git

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 974a4029e06e..cda517024a62 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2898,7 +2898,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 *);