summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-01 22:48:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-04-01 22:48:40 (GMT)
commit3471bb67e7add5c809c00e5c0977047017548b40 (patch)
treec946a26dbd8d7c271a46a873e9687e282c8b5611 /Objects
parent29f843816bb6016ac673a3e0e4b3996fd235a152 (diff)
downloadcpython-3471bb67e7add5c809c00e5c0977047017548b40.zip
cpython-3471bb67e7add5c809c00e5c0977047017548b40.tar.gz
cpython-3471bb67e7add5c809c00e5c0977047017548b40.tar.bz2
remove extraneous condition
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeobject.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 9f0ab15..c12cd7c 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -464,12 +464,10 @@ type_set_bases(PyTypeObject *type, PyObject *value, void *context)
type->tp_name, Py_TYPE(ob)->tp_name);
return -1;
}
- if (PyType_Check(ob)) {
- if (PyType_IsSubtype((PyTypeObject*)ob, type)) {
- PyErr_SetString(PyExc_TypeError,
- "a __bases__ item causes an inheritance cycle");
- return -1;
- }
+ if (PyType_IsSubtype((PyTypeObject*)ob, type)) {
+ PyErr_SetString(PyExc_TypeError,
+ "a __bases__ item causes an inheritance cycle");
+ return -1;
}
}