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

Merge pull request #1462 from dralley/cleanup-pystaticmethod

Browse Source 
Use new style for PyStaticMethod impl
This commit is contained in:
Noah
2019-10-04 12:02:50 -05:00
committed by GitHub
parent 521cf26b5d fb04771cad
commit f4c1ae269a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vm/src/obj/objstaticmethod.rs
View File

@@ -1,7 +1,8 @@
use super::objtype::PyClassRef;
use crate::pyobject::{PyContext, PyObjectRef, PyRef, PyResult, PyValue};
use crate::pyobject::{PyClassImpl, PyContext, PyObjectRef, PyRef, PyResult, PyValue};
use crate::vm::VirtualMachine;
#[pyclass(name = "staticmethod")]
#[derive(Clone, Debug)]
pub struct PyStaticMethod {
pub callable: PyObjectRef,
@@ -14,8 +15,10 @@ impl PyValue for PyStaticMethod {
}
}
#[pyimpl]
impl PyStaticMethodRef {
fn new(
#[pyslot(new)]
fn tp_new(
cls: PyClassRef,
callable: PyObjectRef,
vm: &VirtualMachine,
@@ -26,15 +29,12 @@ impl PyStaticMethodRef {
.into_ref_with_type(vm, cls)
}
#[pymethod(name = "__get__")]
fn get(self, _inst: PyObjectRef, _owner: PyObjectRef, _vm: &VirtualMachine) -> PyResult {
Ok(self.callable.clone())
}
}
pub fn init(context: &PyContext) {
let staticmethod_type = &context.types.staticmethod_type;
extend_class!(context, staticmethod_type, {
"__get__" => context.new_rustfunc(PyStaticMethodRef::get),
(slot new) => PyStaticMethodRef::new,
});
PyStaticMethodRef::extend_class(context, &context.types.staticmethod_type);
}