diff options
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index df057b763c..ad6e7920a5 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1822,7 +1822,7 @@ eval_code2(PyCodeObject *co, PyObject *globals, PyObject *locals, na++; n++; } - else { + else if (!((flags & 1) && na == 0)) { /* Unbound methods must be called with an instance of the class (or a derived class) as first argument */ @@ -1895,6 +1895,20 @@ eval_code2(PyCodeObject *co, PyObject *globals, PyObject *locals, if (nstar < 0) { goto extcall_fail; } + if (class && self == NULL && na == 0) { + /* * arg is first argument of method, + so check it is isinstance of class */ + self = PyTuple_GET_ITEM(stararg, 0); + if (!(PyInstance_Check(self) && + PyClass_IsSubclass((PyObject *) + (((PyInstanceObject *)self)->in_class), + class))) { + PyErr_SetString(PyExc_TypeError, + "unbound method must be called with instance as first argument"); + x = NULL; + break; + } + } } if (nk > 0) { if (kwdict == NULL) { |