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

Fix ImportFrom implementation

Browse Source
This commit is contained in:
Noah
2021-02-17 18:11:37 -06:00
parent 86f907ec0d
commit 58db1752b0
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vm/src/frame.rs
View File

@@ -518,7 +518,11 @@ impl ExecutingFrame<'_> {
}
bytecode::Instruction::ImportNameless => self.import(vm, None),
bytecode::Instruction::ImportStar => self.import_star(vm),
bytecode::Instruction::ImportFrom { idx } => self.import_from(vm, *idx),
bytecode::Instruction::ImportFrom { idx } => {
let obj = self.import_from(vm, *idx)?;
self.push_value(obj);
Ok(None)
}
bytecode::Instruction::LoadFast(idx) => {
let idx = *idx as usize;
let x = self.fastlocals.lock()[idx].clone().ok_or_else(|| {
@@ -1086,15 +1090,22 @@ impl ExecutingFrame<'_> {
}
#[cfg_attr(feature = "flame-it", flame("Frame"))]
fn import_from(&mut self, vm: &VirtualMachine, idx: bytecode::NameIdx) -> FrameResult {
fn import_from(&mut self, vm: &VirtualMachine, idx: bytecode::NameIdx) -> PyResult {
let module = self.last_value();
let name = &self.code.names[idx as usize];
let err = || vm.new_import_error(format!("cannot import name '{}'", name), name.clone());
// Load attribute, and transform any error into import error.
let obj = vm.get_attribute(module, name.clone()).map_err(|_| {
vm.new_import_error(format!("cannot import name '{}'", name), name.clone())
})?;
self.push_value(obj);
Ok(None)
if let Some(obj) = vm.get_attribute_opt(module.clone(), name.clone())? {
return Ok(obj);
}
// fallback to importing '{module.__name__}.{name}' from sys.modules
let mod_name = vm.get_attribute(module, "__name__").map_err(|_| err())?;
let mod_name = mod_name.downcast::<PyStr>().map_err(|_| err())?;
let full_mod_name = format!("{}.{}", mod_name, name);
let sys_modules = vm
.get_attribute(vm.sys_module.clone(), "modules")
.map_err(|_| err())?;
sys_modules.get_item(full_mod_name, vm).map_err(|_| err())
}
#[cfg_attr(feature = "flame-it", flame("Frame"))]