Make property return itself if invoke by class binding

skinnyBat · skinnyBat · commit a5050ebafec9 · 2019-03-20T19:58:54.000+13:00
diff --git a/tests/snippets/property.py b/tests/snippets/property.py
@@ -16,6 +16,8 @@ def foo(self):
 assert f.foo == 100
 assert f.foo == 101
 
+assert type(Fubar.foo) is property
+
 
 null_property = property()
 assert type(null_property) is property
@@ -45,3 +47,5 @@ def foo(self):
 assert p1.getter(None).fget == "a"
 assert p1.setter(None).fset == "b"
 assert p1.deleter(None).fdel == "c"
+
+assert p1.__get__(None, object) is p1
diff --git a/vm/src/obj/objproperty.rs b/vm/src/obj/objproperty.rs
@@ -6,7 +6,7 @@ use crate::function::IntoPyNativeFunc;
 use crate::function::OptionalArg;
 use crate::obj::objstr::PyStringRef;
 use crate::obj::objtype::PyClassRef;
-use crate::pyobject::{PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue};
+use crate::pyobject::{IdProtocol, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue};
 use crate::vm::VirtualMachine;
 
 /// Read-only property, doesn't have __set__ or __delete__
@@ -25,7 +25,11 @@ pub type PyReadOnlyPropertyRef = PyRef<PyReadOnlyProperty>;
 
 impl PyReadOnlyPropertyRef {
     fn get(self, obj: PyObjectRef, _owner: PyClassRef, vm: &mut VirtualMachine) -> PyResult {
-        vm.invoke(self.getter.clone(), obj)
+        if obj.is(&vm.ctx.none) {
+            Ok(self.into_object())
+        } else {
+            vm.invoke(self.getter.clone(), obj)
+        }
     }
 }
 
@@ -66,7 +70,11 @@ impl PyPropertyRef {
 
     fn get(self, obj: PyObjectRef, _owner: PyClassRef, vm: &mut VirtualMachine) -> PyResult {
         if let Some(getter) = self.getter.as_ref() {
-            vm.invoke(getter.clone(), obj)
+            if obj.is(&vm.ctx.none) {
+                Ok(self.into_object())
+            } else {
+                vm.invoke(getter.clone(), obj)
+            }
         } else {
             Err(vm.new_attribute_error("unreadable attribute".to_string()))
         }
