Skip to content

Add import_ensure_initialized to import_module_level #7076

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
youknowone merged 1 commit into from
Feb 11, 2026
Merged

Add import_ensure_initialized to import_module_level #7076

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
26 changes: 25 additions & 1 deletion crates/vm/src/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,27 @@ pub fn import_source(vm: &VirtualMachine, module_name: &str, content: &str) -> P
import_code_obj(vm, module_name, code, false)
}

/// If `__spec__._initializing` is true, wait for the module to finish
/// initializing by calling `_lock_unlock_module`.
fn import_ensure_initialized(
module: &PyObjectRef,
name: &str,
vm: &VirtualMachine,
) -> PyResult<()> {
let initializing = match vm.get_attribute_opt(module.clone(), vm.ctx.intern_str("__spec__"))? {
Some(spec) => match vm.get_attribute_opt(spec, vm.ctx.intern_str("_initializing"))? {
Some(v) => v.try_to_bool(vm)?,
None => false,
},
None => false,
};
if initializing {
let lock_unlock = vm.importlib.get_attr("_lock_unlock_module", vm)?;
lock_unlock.call((vm.ctx.new_str(name),), vm)?;
}
Ok(())
}

pub fn import_code_obj(
vm: &VirtualMachine,
module_name: &str,
Expand Down Expand Up @@ -405,7 +426,10 @@ pub(crate) fn import_module_level(
// import_get_module + import_find_and_load
let sys_modules = vm.sys_module.get_attr("modules", vm)?;
let module = match sys_modules.get_item(&*abs_name, vm) {
Ok(m) if !vm.is_none(&m) => m,
Ok(m) if !vm.is_none(&m) => {
import_ensure_initialized(&m, &abs_name, vm)?;
m
}
_ => {
let find_and_load = vm.importlib.get_attr("_find_and_load", vm)?;
let abs_name_obj = vm.ctx.new_str(&*abs_name);
Expand Down
Loading