From 1c7a0ea05624b7967200e07ee345d26564b11b66 Mon Sep 17 00:00:00 2001 From: Jeremy Hylton Date: Wed, 16 Jul 2003 16:08:23 +0000 Subject: Remove unnecessary check in tests for slots allowed. The !PyType_Check(base) check snuck in as part of rev 2.215, but was unrelated to the SF patch that is mentioned in the checkin comment. The test is currently unnecessary because base is set to the return value of best_bases(), which returns a type or NULL. --- Objects/typeobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Objects/typeobject.c b/Objects/typeobject.c index a8c8b15..f251179 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1653,7 +1653,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds) /* Are slots allowed? */ nslots = PyTuple_GET_SIZE(slots); - if (nslots > 0 && base->tp_itemsize != 0 && !PyType_Check(base)) { + if (nslots > 0 && base->tp_itemsize != 0) { /* for the special case of meta types, allow slots */ PyErr_Format(PyExc_TypeError, "nonempty __slots__ " -- cgit v0.12