From fbaff7fd50aaacdfa90a8b2bd7f4eba15ccf665a Mon Sep 17 00:00:00 2001 From: Aviv Palivoda Date: Fri, 7 Jun 2019 19:16:12 +0300 Subject: [PATCH] Install external importers on init_importlib --- vm/src/import.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vm/src/import.rs b/vm/src/import.rs index 33335583e..c91371de7 100644 --- a/vm/src/import.rs +++ b/vm/src/import.rs @@ -14,8 +14,10 @@ use crate::vm::VirtualMachine; pub fn init_importlib(vm: &VirtualMachine) -> PyResult { let importlib = import_frozen(vm, "_frozen_importlib")?; let impmod = import_builtin(vm, "_imp")?; - let install = vm.get_attribute(importlib, "_install")?; - vm.invoke(install, vec![vm.sys_module.clone(), impmod]) + 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![]) } fn import_frozen(vm: &VirtualMachine, module_name: &str) -> PyResult {