Fix property to take keyword arguments

youknowone · youknowone · commit 268164e957cd · 2019-05-11T06:03:53.000+09:00
diff --git a/tests/snippets/property.py b/tests/snippets/property.py
@@ -59,6 +59,8 @@ def foo(self):
 with assertRaises(TypeError):
     property.__new__(object)
 
+# assert p.__doc__ is None
+
 
 p1 = property("a", "b", "c")
 
@@ -75,3 +77,7 @@ def foo(self):
 assert p1.deleter(None).fdel == "c"
 
 assert p1.__get__(None, object) is p1
+# assert p1.__doc__ is 'a'.__doc__
+
+p2 = property('a', doc='pdoc')
+# assert p2.__doc__ == 'pdoc'
diff --git a/vm/src/obj/objproperty.rs b/vm/src/obj/objproperty.rs
@@ -2,9 +2,7 @@
 
 */
 
-use crate::function::IntoPyNativeFunc;
-use crate::function::OptionalArg;
-use crate::obj::objstr::PyStringRef;
+use crate::function::{IntoPyNativeFunc, OptionalArg, PyFuncArgs};
 use crate::obj::objtype::PyClassRef;
 use crate::pyobject::{
     IdProtocol, PyClassImpl, PyContext, PyObject, PyObjectRef, PyRef, PyResult, PyValue,
@@ -82,6 +80,7 @@ pub struct PyProperty {
     getter: Option<PyObjectRef>,
     setter: Option<PyObjectRef>,
     deleter: Option<PyObjectRef>,
+    doc: Option<PyObjectRef>,
 }
 
 impl PyValue for PyProperty {
@@ -97,16 +96,31 @@ impl PyProperty {
     #[pymethod(name = "__new__")]
     fn new_property(
         cls: PyClassRef,
-        fget: OptionalArg<PyObjectRef>,
-        fset: OptionalArg<PyObjectRef>,
-        fdel: OptionalArg<PyObjectRef>,
-        _doc: OptionalArg<PyStringRef>,
+        args: PyFuncArgs,
         vm: &VirtualMachine,
     ) -> PyResult<PyPropertyRef> {
+        arg_check!(
+            vm,
+            args,
+            required = [],
+            optional = [(fget, None), (fset, None), (fdel, None), (doc, None)]
+        );
+
+        fn into_option(vm: &VirtualMachine, arg: Option<&PyObjectRef>) -> Option<PyObjectRef> {
+            arg.and_then(|arg| {
+                if vm.ctx.none().is(arg) {
+                    None
+                } else {
+                    Some(arg.clone())
+                }
+            })
+        }
+
         PyProperty {
-            getter: fget.into_option(),
-            setter: fset.into_option(),
-            deleter: fdel.into_option(),
+            getter: into_option(vm, fget),
+            setter: into_option(vm, fset),
+            deleter: into_option(vm, fdel),
+            doc: into_option(vm, doc),
         }
         .into_ref_with_type(vm, cls)
     }
@@ -187,6 +201,7 @@ impl PyProperty {
             getter: getter.or_else(|| zelf.getter.clone()),
             setter: zelf.setter.clone(),
             deleter: zelf.deleter.clone(),
+            doc: None,
         }
         .into_ref_with_type(vm, TypeProtocol::class(&zelf))
     }
@@ -201,6 +216,7 @@ impl PyProperty {
             getter: zelf.getter.clone(),
             setter: setter.or_else(|| zelf.setter.clone()),
             deleter: zelf.deleter.clone(),
+            doc: None,
         }
         .into_ref_with_type(vm, TypeProtocol::class(&zelf))
     }
@@ -215,6 +231,7 @@ impl PyProperty {
             getter: zelf.getter.clone(),
             setter: zelf.setter.clone(),
             deleter: deleter.or_else(|| zelf.deleter.clone()),
+            doc: None,
         }
         .into_ref_with_type(vm, TypeProtocol::class(&zelf))
     }
@@ -259,6 +276,7 @@ impl<'a> PropertyBuilder<'a> {
                 getter: self.getter.clone(),
                 setter: self.setter.clone(),
                 deleter: None,
+                doc: None,
             };
 
             PyObject::new(payload, self.ctx.property_type(), None)
