Commit090cfed

committed

Use importlib import in WASM

1 parent6b018a0 commit090cfedCopy full SHA for 090cfed

File tree

-32

lines changed

-32

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ fn main() {`
`51`	`51`	`// Construct vm:`
`52`	`52`	`let vm =VirtualMachine::new();`
`53`	`53`
`54`		`-let res = import::init_importlib(&vm);`
	`54`	`+let res = import::init_importlib(&vm,true);`
`55`	`55`	`handle_exception(&vm, res);`
`56`	`56`
`57`	`57`	`// Figure out if a -c option was given:`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,18 @@ use crate::vm::VirtualMachine;`
`13`	`13`	`#[cfg(feature ="rustpython-compiler")]`
`14`	`14`	`use rustpython_compiler::compile;`
`15`	`15`
`16`		`-pubfninit_importlib(vm:&VirtualMachine) ->PyResult{`
	`16`	`+pubfninit_importlib(vm:&VirtualMachine,external:bool) ->PyResult{`
`17`	`17`	`let importlib =import_frozen(vm,"_frozen_importlib")?;`
`18`	`18`	`let impmod =import_builtin(vm,"_imp")?;`
`19`	`19`	`let install = vm.get_attribute(importlib.clone(),"_install")?;`
`20`	`20`	`vm.invoke(install,vec![vm.sys_module.clone(), impmod])?;`
`21`	`21`	`vm.import_func`
`22`	`22`	`.replace(vm.get_attribute(importlib.clone(),"__import__")?);`
`23`		`-let install_external = vm.get_attribute(importlib.clone(),"_install_external_importers")?;`
`24`		`- vm.invoke(install_external,vec![])?;`
	`23`	`+if external{`
	`24`	`+let install_external =`
	`25`	`+ vm.get_attribute(importlib.clone(),"_install_external_importers")?;`
	`26`	`+ vm.invoke(install_external,vec![])?;`
	`27`	`+}`
`25`	`28`	`Ok(vm.get_none())`
`26`	`29`	`}`
`27`	`30`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ use wasm_bindgen::prelude::*;`
`8`	`8`	`use rustpython_compiler::{compile, error::CompileErrorType};`
`9`	`9`	`use rustpython_vm::frame::{NameProtocol,Scope};`
`10`	`10`	`use rustpython_vm::function::PyFuncArgs;`
	`11`	`+use rustpython_vm::import;`
`11`	`12`	`use rustpython_vm::pyobject::{PyObject,PyObjectPayload,PyObjectRef,PyResult,PyValue};`
`12`	`13`	`use rustpython_vm::VirtualMachine;`
`13`	`14`
`@@ -43,7 +44,7 @@ impl StoredVirtualMachine {`
`43`	`44`	`setup_browser_module(&vm);`
`44`	`45`	`}`
`45`	`46`
`46`		`-*vm.import_func.borrow_mut() = vm.ctx.new_rustfunc(wasm_builtins::builtin_import);`
	`47`	`+import::init_importlib(&vm,false);`
`47`	`48`
`48`	`49`	`StoredVirtualMachine{`
`49`	`50`	`vm,`

Lines changed: 0 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ use js_sys::{self, Array};`
`8`	`8`	`use web_sys::{self, console};`
`9`	`9`
`10`	`10`	`use rustpython_vm::function::{Args,KwArgs,PyFuncArgs};`
`11`		`-use rustpython_vm::import;`
`12`	`11`	`use rustpython_vm::obj::{`
`13`	`12`	`objstr::{self,PyStringRef},`
`14`	`13`	`objtype,`
`@@ -80,29 +79,3 @@ pub fn builtin_print_console(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult`
`80`	`79`	`console::log(&arr);`
`81`	`80`	`Ok(vm.get_none())`
`82`	`81`	`}`
`83`		`-`
`84`		`-pubfnbuiltin_import(`
`85`		`-module_name:PyStringRef,`
`86`		`-_args:Args,`
`87`		`-_kwargs:KwArgs,`
`88`		`-vm:&VirtualMachine,`
`89`		`-) ->PyResult<PyObjectRef>{`
`90`		`-let module_name = module_name.as_str();`
`91`		`-`
`92`		`-let sys_modules = vm.get_attribute(vm.sys_module.clone(),"modules").unwrap();`
`93`		`-`
`94`		`-// First, see if we already loaded the module:`
`95`		`-ifletOk(module) = sys_modules.get_item(module_name.to_string(), vm){`
`96`		`-Ok(module)`
`97`		`-}elseif vm.frozen.borrow().contains_key(module_name){`
`98`		`- import::import_frozen(vm, module_name)`
`99`		`-}elseif vm.stdlib_inits.borrow().contains_key(module_name){`
`100`		`- import::import_builtin(vm, module_name)`
`101`		`-}else{`
`102`		`-let notfound_error = vm.context().exceptions.module_not_found_error.clone();`
`103`		`-Err(vm.new_exception(`
`104`		`- notfound_error,`
`105`		`-format!("Module {:?} not found", module_name),`
`106`		`-))`
`107`		`-}`
`108`		`-}`

Comments

(0)