Use _bootstrap.py __import__

palaviv · palaviv · commit da88a59a4d1f · 2019-06-07T20:18:55.000+03:00
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -732,27 +732,7 @@ fn builtin_sum(iterable: PyIterable, start: OptionalArg, vm: &VirtualMachine) ->
 
 // Should be renamed to builtin___import__?
 fn builtin_import(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
-    arg_check!(
-        vm,
-        args,
-        required = [(name, Some(vm.ctx.str_type()))],
-        optional = [
-            (_globals, Some(vm.ctx.dict_type())),
-            (_locals, Some(vm.ctx.dict_type()))
-        ]
-    );
-    let current_path = {
-        match vm.current_frame() {
-            Some(frame) => {
-                let mut source_pathbuf = PathBuf::from(&frame.code.source_path);
-                source_pathbuf.pop();
-                source_pathbuf
-            }
-            None => PathBuf::new(),
-        }
-    };
-
-    import_module(vm, current_path, &objstr::get_value(name))
+    vm.invoke(vm.import_func.borrow().clone(), args)
 }
 
 // builtin_vars
diff --git a/vm/src/import.rs b/vm/src/import.rs
@@ -16,8 +16,11 @@ pub fn init_importlib(vm: &VirtualMachine) -> PyResult {
     let impmod = import_builtin(vm, "_imp")?;
     let install = vm.get_attribute(importlib.clone(), "_install")?;
     vm.invoke(install, vec![vm.sys_module.clone(), impmod])?;
-    let install_external = vm.get_attribute(importlib, "_install_external_importers")?;
-    vm.invoke(install_external, vec![])
+    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![])?;
+    Ok(vm.get_none())
 }
 
 fn import_frozen(vm: &VirtualMachine, module_name: &str) -> PyResult {
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -55,6 +55,7 @@ pub struct VirtualMachine {
     pub wasm_id: Option<String>,
     pub exceptions: RefCell<Vec<PyObjectRef>>,
     pub frozen: RefCell<HashMap<String, &'static str>>,
+    pub import_func: RefCell<PyObjectRef>,
 }
 
 impl VirtualMachine {
@@ -68,6 +69,7 @@ impl VirtualMachine {
 
         let stdlib_inits = RefCell::new(stdlib::get_module_inits());
         let frozen = RefCell::new(frozen::get_module_inits());
+        let import_func = RefCell::new(ctx.none());
         let vm = VirtualMachine {
             builtins: builtins.clone(),
             sys_module: sysmod.clone(),
@@ -77,6 +79,7 @@ impl VirtualMachine {
             wasm_id: None,
             exceptions: RefCell::new(vec![]),
             frozen,
+            import_func,
         };
 
         builtins::make_module(&vm, builtins.clone());
