Author: guido.van.rossum
Date: Fri May 25 19:55:52 2007
New Revision: 55588
Added:
python/branches/py3k-struni/Lib/test/test_typechecks.py
- copied unchanged from r55587,
python/branches/p3yk/Lib/test/test_typechecks.py
Modified:
python/branches/py3k-struni/ (props changed)
python/branches/py3k-struni/Objects/abstract.c
Log:
Merged revisions 55545-55587 via svnmerge from
svn+ssh://[EMAIL PROTECTED]/python/branches/p3yk
........
r55587 | guido.van.rossum | 2007-05-25 10:37:01 -0700 (Fri, 25 May 2007) | 2
lines
Implement isinstance and issubclass overriding, a la PEP 3119.
........
Modified: python/branches/py3k-struni/Objects/abstract.c
==============================================================================
--- python/branches/py3k-struni/Objects/abstract.c (original)
+++ python/branches/py3k-struni/Objects/abstract.c Fri May 25 19:55:52 2007
@@ -2130,7 +2130,25 @@
int
PyObject_IsInstance(PyObject *inst, PyObject *cls)
{
- return recursive_isinstance(inst, cls, Py_GetRecursionLimit());
+ PyObject *t, *v, *tb;
+ PyErr_Fetch(&t, &v, &tb);
+ PyObject *checker = PyObject_GetAttrString(cls, "__instancecheck__");
+ PyErr_Restore(t, v, tb);
+ if (checker != NULL) {
+ PyObject *res;
+ int ok = -1;
+ if (Py_EnterRecursiveCall(" in __instancecheck__"))
+ return ok;
+ res = PyObject_CallFunctionObjArgs(checker, inst, NULL);
+ Py_LeaveRecursiveCall();
+ Py_DECREF(checker);
+ if (res != NULL) {
+ ok = PyObject_IsTrue(res);
+ Py_DECREF(res);
+ }
+ return ok;
+ }
+ return recursive_isinstance(inst, cls, Py_GetRecursionLimit());
}
static int
@@ -2180,7 +2198,25 @@
int
PyObject_IsSubclass(PyObject *derived, PyObject *cls)
{
- return recursive_issubclass(derived, cls, Py_GetRecursionLimit());
+ PyObject *t, *v, *tb;
+ PyErr_Fetch(&t, &v, &tb);
+ PyObject *checker = PyObject_GetAttrString(cls, "__subclasscheck__");
+ PyErr_Restore(t, v, tb);
+ if (checker != NULL) {
+ PyObject *res;
+ int ok = -1;
+ if (Py_EnterRecursiveCall(" in __subclasscheck__"))
+ return ok;
+ res = PyObject_CallFunctionObjArgs(checker, derived, NULL);
+ Py_LeaveRecursiveCall();
+ Py_DECREF(checker);
+ if (res != NULL) {
+ ok = PyObject_IsTrue(res);
+ Py_DECREF(res);
+ }
+ return ok;
+ }
+ return recursive_issubclass(derived, cls, Py_GetRecursionLimit());
}
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
