Merge pull request RustPython#665 from RustPython/type_mro

windelbouwman · web-flow · commit f0e285d124c0 · 2019-03-13T12:05:59.000+01:00
Type mro
diff --git a/tests/snippets/mro.py b/tests/snippets/mro.py
@@ -18,3 +18,5 @@ class C(A, B):
     pass
 
 assert (C, A, B, X, Y, object) == C.__mro__
+
+assert type.__mro__ == (type, object)
diff --git a/vm/src/obj/objproperty.rs b/vm/src/obj/objproperty.rs
@@ -119,7 +119,7 @@ impl<'a, T> PropertyBuilder<'a, T> {
         }
     }
 
-    pub fn add_setter<I, F: IntoPyNativeFunc<(I, T), PyResult>>(self, func: F) -> Self {
+    pub fn add_setter<I, V, F: IntoPyNativeFunc<(I, V), PyResult>>(self, func: F) -> Self {
         let func = self.ctx.new_rustfunc(func);
         Self {
             ctx: self.ctx,
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -9,6 +9,7 @@ use crate::vm::VirtualMachine;
 
 use super::objdict;
 use super::objlist::PyList;
+use super::objproperty::PropertyBuilder;
 use super::objstr::{self, PyStringRef};
 use super::objtuple::PyTuple;
 
@@ -78,6 +79,10 @@ impl PyClassRef {
         PyTuple::from(elements)
     }
 
+    fn set_mro(self, _value: PyObjectRef, vm: &mut VirtualMachine) -> PyResult {
+        Err(vm.new_attribute_error("read-only attribute".to_string()))
+    }
+
     fn dir(self, vm: &mut VirtualMachine) -> PyList {
         let attributes = get_attributes(self);
         let attributes: Vec<PyObjectRef> = attributes
@@ -116,7 +121,11 @@ pub fn init(ctx: &PyContext) {
     extend_class!(&ctx, &ctx.type_type, {
         "__call__" => ctx.new_rustfunc(type_call),
         "__new__" => ctx.new_rustfunc(type_new),
-        "__mro__" => ctx.new_property(PyClassRef::mro),
+        "__mro__" =>
+            PropertyBuilder::new(ctx)
+                .add_getter(PyClassRef::mro)
+                .add_setter(PyClassRef::set_mro)
+                .create(),
         "__repr__" => ctx.new_rustfunc(PyClassRef::repr),
         "__prepare__" => ctx.new_rustfunc(PyClassRef::prepare),
         "__getattribute__" => ctx.new_rustfunc(type_getattribute),

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ impl<'a, T> PropertyBuilder<'a, T> {`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- pub fn add_setter<I, F: IntoPyNativeFunc<(I, T), PyResult>>(self, func: F) -> Self {`
	`122`	`+ pub fn add_setter<I, V, F: IntoPyNativeFunc<(I, V), PyResult>>(self, func: F) -> Self {`
`123`	`123`	`let func = self.ctx.new_rustfunc(func);`
`124`	`124`	`Self {`
`125`	`125`	`ctx: self.ctx,`