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

Make property.__get__ owner parameter optional

Browse Source
This commit is contained in:
ben
2019-03-21 19:57:35 +13:00
parent a5f6a7b10d
commit 4ad8d5ed9b
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,12 @@ impl PyValue for PyReadOnlyProperty {
pub type PyReadOnlyPropertyRef = PyRef<PyReadOnlyProperty>;
impl PyReadOnlyPropertyRef {
fn get(self, obj: PyObjectRef, _owner: PyClassRef, vm: &mut VirtualMachine) -> PyResult {
fn get(
self,
obj: PyObjectRef,
_owner: OptionalArg<PyClassRef>,
vm: &mut VirtualMachine,
) -> PyResult {
if obj.is(&vm.ctx.none) {
Ok(self.into_object())
} else {
@@ -81,7 +86,12 @@ impl PyPropertyRef {
}
}
fn get(self, obj: PyObjectRef, _owner: PyClassRef, vm: &mut VirtualMachine) -> PyResult {
fn get(
self,
obj: PyObjectRef,
_owner: OptionalArg<PyClassRef>,
vm: &mut VirtualMachine,
) -> PyResult {
if let Some(getter) = self.getter.as_ref() {
if obj.is(&vm.ctx.none) {
Ok(self.into_object())