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

Respect module.__getattr__

Browse Source
This commit is contained in:
Noah
2021-02-17 21:01:14 -06:00
parent f63f155dfa
commit 7a84e2b6c9
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
vm/src/builtins/module.rs
View File

@@ -94,17 +94,24 @@ impl PyModule {
impl SlotGetattro for PyModule {
fn getattro(zelf: PyRef<Self>, name: PyStrRef, vm: &VirtualMachine) -> PyResult {
vm.generic_getattribute_opt(zelf.as_object().clone(), name.clone(), None)?
.ok_or_else(|| {
let module_name = if let Some(name) = Self::name(zelf, vm) {
format!(" '{}'", name)
} else {
"".to_owned()
};
vm.new_attribute_error(
format!("module{} has no attribute '{}'", module_name, name,),
)
})
if let Some(attr) =
vm.generic_getattribute_opt(zelf.as_object().clone(), name.clone(), None)?
{
return Ok(attr);
}
if let Some(getattr) = zelf
.as_object()
.dict()
.and_then(|d| d.get_item("__getattr__", vm).ok())
{
return vm.invoke(&getattr, (name,));
}
let module_name = if let Some(name) = Self::name(zelf, vm) {
format!(" '{}'", name)
} else {
"".to_owned()
};
Err(vm.new_attribute_error(format!("module{} has no attribute '{}'", module_name, name)))
}
}