Rust-related/RustPython
1
0
Fork 1
mirror of https://github.com/RustPython/RustPython.git synced 2026-06-02 19:39:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix locals and globals in call to __import__

Browse Source
This commit is contained in:
Aviv Palivoda
2019-06-30 20:09:26 +03:00
parent a332b74ad8
commit 49f3bf7401
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vm/src/vm.rs
View File

@@ -309,17 +309,20 @@ impl VirtualMachine {
.get_attribute(self.builtins.clone(), "__import__")
.map_err(|_| self.new_import_error("__import__ not found".to_string()))?;
let locals = if let Some(frame) = self.current_frame() {
frame.scope.get_locals().into_object()
let (locals, globals) = if let Some(frame) = self.current_frame() {
(
frame.scope.get_locals().into_object(),
frame.scope.globals.clone().into_object(),
)
} else {
self.get_none()
(self.get_none(), self.get_none())
};
self.invoke(
import_func,
vec![
self.ctx.new_str(module.to_string()),
globals,
locals,
self.get_none(),
from_list.clone(),
self.ctx.new_int(level),
],