Merge pull request RustPython#1689 from youknowone/pymethod-magic

youknowone · web-flow · commit d7085db17d3a · 2020-01-26T12:04:39.000+09:00
#[pymethod(magic)]: pyname as __{sig.ident}__ form
diff --git a/derive/src/pyclass.rs b/derive/src/pyclass.rs
@@ -68,14 +68,28 @@ impl Class {
                 NestedMeta::Meta(meta) => meta,
                 NestedMeta::Lit(_) => continue,
             };
-            if let Meta::NameValue(name_value) = meta {
-                if path_eq(&name_value.path, "name") {
-                    if let Lit::Str(s) = &name_value.lit {
-                        py_name = Some(s.value());
+
+            match meta {
+                Meta::NameValue(name_value) => {
+                    if path_eq(&name_value.path, "name") {
+                        if let Lit::Str(s) = &name_value.lit {
+                            py_name = Some(s.value());
+                        } else {
+                            bail_span!(&sig.ident, "#[pymethod(name = ...)] must be a string");
+                        }
+                    }
+                }
+                Meta::Path(path) => {
+                    if path.get_ident().map_or(false, |v| v == "magic") {
+                        py_name = Some(format!("__{}__", sig.ident.to_string()));
                     } else {
-                        bail_span!(&sig.ident, "#[pymethod(name = ...)] must be a string");
+                        bail_span!(
+                            &sig.ident,
+                            "#[pymethod(magic)] or #[pymethod(name = ...)] is expected"
+                        );
                     }
                 }
+                _ => (),
             }
         }
 
diff --git a/vm/src/obj/objfunction.rs b/vm/src/obj/objfunction.rs
@@ -242,7 +242,7 @@ impl PyValue for PyFunction {
 
 #[pyimpl(with(PyBuiltinDescriptor))]
 impl PyFunction {
-    #[pymethod(name = "__call__")]
+    #[pymethod(magic)]
     fn call(zelf: PyObjectRef, args: PyFuncArgs, vm: &VirtualMachine) -> PyResult {
         vm.invoke(&zelf, args)
     }

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ impl PyValue for PyFunction {`
`242`	`242`
`243`	`243`	`#[pyimpl(with(PyBuiltinDescriptor))]`
`244`	`244`	`impl PyFunction {`
`245`		`- #[pymethod(name = "__call__")]`
	`245`	`+ #[pymethod(magic)]`
`246`	`246`	`fn call(zelf: PyObjectRef, args: PyFuncArgs, vm: &VirtualMachine) -> PyResult {`
`247`	`247`	`vm.invoke(&zelf, args)`
`248`	`248`	`}`