Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion vm/src/builtins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use crate::obj::objdict::PyDictRef;
use crate::obj::objint::{self, PyIntRef};
use crate::obj::objiter;
use crate::obj::objstr::{PyString, PyStringRef};
use crate::obj::objtype::{self, PyClassRef};
use crate::obj::objtype::{self, PyClass, PyClassRef};
#[cfg(feature = "rustpython-compiler")]
use rustpython_compiler::compile;

Expand Down Expand Up @@ -944,5 +944,13 @@ pub fn builtin_build_class_(
vec![name_obj, bases, namespace.into_object()],
)?;
cells.set_item("__class__", class.clone(), vm)?;

for base_class in class.clone().downcast::<PyClass>().unwrap().mro.clone() {
if let Ok(initter) = vm.get_attribute(base_class.into_object(), "__init_subclass__") {
let args: Args = Args::new(vec![class.clone()]);
vm.invoke(&initter, PyFuncArgs::from((&args, &kwargs)))?;
break;
}
}
Ok(class)
}
3 changes: 3 additions & 0 deletions vm/src/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ impl<T> Args<T> {
pub fn into_vec(self) -> Vec<T> {
self.0
}
pub fn new(args: Vec<T>) -> Self {
Self(args)
}
}

impl<T: PyValue> Args<PyRef<T>> {
Expand Down