Skip to content

py/runtime: Fix self arg passed to classmethod when accessed via super (micropython PR 15333) #9926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2024
Merged

py/runtime: Fix self arg passed to classmethod when accessed via super (micropython PR 15333) #9926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions py/runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,10 @@ void mp_convert_member_lookup(mp_obj_t self, const mp_obj_type_t *type, mp_obj_t
// 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);
if (type == &mp_type_type) {
// `self` is already a type, so use `self` directly.
type = MP_OBJ_TO_PTR(self);
}
}
dest[0] = ((mp_obj_static_class_method_t *)MP_OBJ_TO_PTR(member))->fun;
dest[1] = MP_OBJ_FROM_PTR(type);
Expand Down
31 changes: 31 additions & 0 deletions tests/basics/subclass_classmethod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,34 @@ class B(A):
B.bar() # class calling classmethod
B().bar() # instance calling classmethod
B().baz() # instance calling normal method

# super inside a classmethod
# ensure the argument of the super method that is called is the child type


class C:
@classmethod
def f(cls):
print("C.f", cls.__name__) # cls should be D

@classmethod
def g(cls):
print("C.g", cls.__name__) # cls should be D


class D(C):
@classmethod
def f(cls):
print("D.f", cls.__name__)
super().f()

@classmethod
def g(cls):
print("D.g", cls.__name__)
super(D, cls).g()


D.f()
D.g()
D().f()
D().g()