Commit f5dd9141 authored by Guido van Rossum's avatar Guido van Rossum

Support type objects in isinstance().

E.g. isinstance('',types.StringType) will return true now instead of
raising a TypeError exception.  This is for JPython compatibility.
parent 6cedf82a
......@@ -1627,18 +1627,23 @@ builtin_isinstance(self, args)
if (!PyArg_ParseTuple(args, "OO", &inst, &cls))
return NULL;
if (!PyClass_Check(cls)) {
PyErr_SetString(PyExc_TypeError,
"second argument must be a class");
return NULL;
if (PyType_Check(cls)) {
retval = (inst->ob_type == cls);
}
if (!PyInstance_Check(inst))
retval = 0;
else {
PyObject *inclass =
(PyObject*)((PyInstanceObject*)inst)->in_class;
retval = PyClass_IsSubclass(inclass, cls);
if (!PyClass_Check(cls)) {
PyErr_SetString(PyExc_TypeError,
"second argument must be a class");
return NULL;
}
if (!PyInstance_Check(inst))
retval = 0;
else {
PyObject *inclass =
(PyObject*)((PyInstanceObject*)inst)->in_class;
retval = PyClass_IsSubclass(inclass, cls);
}
}
return PyInt_FromLong(retval);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment