mschoi/RustPython
1
0
Fork 0
forked from Rust-related/RustPython
Code Pull Requests Actions Activity

Fix __get__ in @classmethod

Browse Source
This commit is contained in:
ChJR
2022-06-13 07:11:41 +09:00
parent ced6b682bf
commit d6e71ad18a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vm/src/builtins/classmethod.rs
View File

@@ -53,10 +53,13 @@ impl GetDescriptor for PyClassMethod {
cls: Option<PyObjectRef>,
vm: &VirtualMachine,
) -> PyResult {
let (zelf, obj) = Self::_unwrap(zelf, obj, vm)?;
let cls = cls.unwrap_or_else(|| obj.class().clone().into());
let callable = zelf.callable.lock().clone();
Ok(PyBoundMethod::new_ref(cls, callable, &vm.ctx).into())
let (zelf, _obj) = Self::_unwrap(zelf, obj.clone(), vm)?;
let cls = cls.unwrap_or_else(|| _obj.class().clone().into());
let _descr_get: PyResult<PyObjectRef> = zelf.callable.lock().get_attr("__get__", vm);
match _descr_get {
Err(_) => Ok(PyBoundMethod::new_ref(cls, zelf.callable.lock().clone(), &vm.ctx).into()),
Ok(_descr_get) => vm.invoke(&_descr_get, (cls.clone(), cls)),
}
}
}