Skip to content

Use importlib import in WASM #1101

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
windelbouwman merged 1 commit into from
Jul 3, 2019
Merged

Use importlib import in WASM #1101

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
2 changes: 1 addition & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fn main() {
// Construct vm:
let vm = VirtualMachine::new();

let res = import::init_importlib(&vm);
let res = import::init_importlib(&vm, true);
handle_exception(&vm, res);

// Figure out if a -c option was given:
Expand Down
9 changes: 6 additions & 3 deletions vm/src/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,18 @@ use crate::vm::VirtualMachine;
#[cfg(feature = "rustpython-compiler")]
use rustpython_compiler::compile;

pub fn init_importlib(vm: &VirtualMachine) -> PyResult {
pub fn init_importlib(vm: &VirtualMachine, external: bool) -> PyResult {
let importlib = import_frozen(vm, "_frozen_importlib")?;
let impmod = import_builtin(vm, "_imp")?;
let install = vm.get_attribute(importlib.clone(), "_install")?;
vm.invoke(install, vec![vm.sys_module.clone(), impmod])?;
vm.import_func
.replace(vm.get_attribute(importlib.clone(), "__import__")?);
let install_external = vm.get_attribute(importlib.clone(), "_install_external_importers")?;
vm.invoke(install_external, vec![])?;
if external {
let install_external =
vm.get_attribute(importlib.clone(), "_install_external_importers")?;
vm.invoke(install_external, vec![])?;
}
Ok(vm.get_none())
}

Expand Down
3 changes: 2 additions & 1 deletion wasm/lib/src/vm_class.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use wasm_bindgen::prelude::*;
use rustpython_compiler::{compile, error::CompileErrorType};
use rustpython_vm::frame::{NameProtocol, Scope};
use rustpython_vm::function::PyFuncArgs;
use rustpython_vm::import;
use rustpython_vm::pyobject::{PyObject, PyObjectPayload, PyObjectRef, PyResult, PyValue};
use rustpython_vm::VirtualMachine;

Expand Down Expand Up @@ -43,7 +44,7 @@ impl StoredVirtualMachine {
setup_browser_module(&vm);
}

*vm.import_func.borrow_mut() = vm.ctx.new_rustfunc(wasm_builtins::builtin_import);
import::init_importlib(&vm, false);

StoredVirtualMachine {
vm,
Expand Down
27 changes: 0 additions & 27 deletions wasm/lib/src/wasm_builtins.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use js_sys::{self, Array};
use web_sys::{self, console};

use rustpython_vm::function::{Args, KwArgs, PyFuncArgs};
use rustpython_vm::import;
use rustpython_vm::obj::{
objstr::{self, PyStringRef},
objtype,
Expand Down Expand Up @@ -80,29 +79,3 @@ pub fn builtin_print_console(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult
console::log(&arr);
Ok(vm.get_none())
}

pub fn builtin_import(
module_name: PyStringRef,
_args: Args,
_kwargs: KwArgs,
vm: &VirtualMachine,
) -> PyResult<PyObjectRef> {
let module_name = module_name.as_str();

let sys_modules = vm.get_attribute(vm.sys_module.clone(), "modules").unwrap();

// First, see if we already loaded the module:
if let Ok(module) = sys_modules.get_item(module_name.to_string(), vm) {
Ok(module)
} else if vm.frozen.borrow().contains_key(module_name) {
import::import_frozen(vm, module_name)
} else if vm.stdlib_inits.borrow().contains_key(module_name) {
import::import_builtin(vm, module_name)
} else {
let notfound_error = vm.context().exceptions.module_not_found_error.clone();
Err(vm.new_exception(
notfound_error,
format!("Module {:?} not found", module_name),
))
}
}