Commit 3ff259a2 authored by Damien George's avatar Damien George
Browse files

py: Fix calling of parent classmethod from instance of subclass.

Addresses issue #1697.
parent 1be0fde4
......@@ -934,6 +934,11 @@ void mp_convert_member_lookup(mp_obj_t self, const mp_obj_type_t *type, mp_obj_t
dest[0] = ((mp_obj_static_class_method_t*)MP_OBJ_TO_PTR(member))->fun;
} else if (MP_OBJ_IS_TYPE(member, &mp_type_classmethod)) {
// return a bound method, with self being the type of this object
// this type should be the type of the original instance, not the base
// type (which is what is passed in the 'type' argument to this function)
if (self != MP_OBJ_NULL) {
type = mp_obj_get_type(self);
dest[0] = ((mp_obj_static_class_method_t*)MP_OBJ_TO_PTR(member))->fun;
dest[1] = MP_OBJ_FROM_PTR(type);
} else if (MP_OBJ_IS_TYPE(member, &mp_type_type)) {
......@@ -10,3 +10,22 @@ class Sub(Base):
# overriding a member and accessing it via a classmethod
class A(object):
foo = 0
def bar(cls):
def baz(self):
class B(A):
foo = 1 # class calling classmethod
B().bar() # instance calling classmethod
B().baz() # instance calling normal method
Supports Markdown
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