Commit081a33f

authored

Merge pull requestRustPython#185 from RustPython/prepare

Add support for __prepare__.

2 parents039b5bb +008c364 commit081a33fCopy full SHA for 081a33f

File tree

+25

-4

lines changed

+25

-4

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,9 @@ class MC(type):`
`2`	`2`	`classes= []`
`3`	`3`	`count=0`
`4`	`4`
	`5`	`+def__prepare__(name,bases):`
	`6`	`+return {'prepared':True}`
	`7`	`+`
`5`	`8`	`def__new__(cls,name,bases,namespace):`
`6`	`9`	`MC.classes.append(name)`
`7`	`10`	`returntype.__new__(cls,name,bases,namespace)`
`@@ -16,10 +19,13 @@ def __new__(cls, count):`
`16`	`19`	`self.count=count`
`17`	`20`	`returnself`
`18`	`21`
`19`		`-classD(object,metaclass=MC):`
	`22`	`+classD(metaclass=MC):`
`20`	`23`	`pass`
`21`	`24`
`22`	`25`	`assertMC==type(C)`
`23`	`26`	`assertC==type(C())`
`24`	`27`	`assertMC.classes== ['C','D']`
`25`	`28`	`assertC().count==2`
	`29`	`+`
	`30`	`+assertC.prepared`
	`31`	`+assertD.prepared`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,19 @@ pub fn builtin_build_class_(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> Py`
`635`	`635`	`let metaclass = args.get_kwarg("metaclass", vm.get_type());`
`636`	`636`
`637`	`637`	`bases.push(vm.context().object());`
`638`		`-let namespace = vm.new_dict();`
	`638`	`+let bases = vm.context().new_tuple(bases);`
	`639`	`+`
	`640`	`+// Prepare uses full __getattribute__ resolution chain.`
	`641`	`+let prepare_name = vm.new_str("__prepare__".to_string());`
	`642`	`+let prepare = vm.get_attribute(metaclass.clone(), prepare_name)?;`
	`643`	`+let namespace = vm.invoke(`
	`644`	`+ prepare,`
	`645`	`+PyFuncArgs{`
	`646`	`+args:vec![name_arg.clone(), bases.clone()],`
	`647`	`+kwargs:vec![],`
	`648`	`+},`
	`649`	`+)?;`
	`650`	`+`
`639`	`651`	`&vm.invoke(`
`640`	`652`	`function,`
`641`	`653`	`PyFuncArgs{`
`@@ -644,8 +656,6 @@ pub fn builtin_build_class_(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> Py`
`644`	`656`	`},`
`645`	`657`	`);`
`646`	`658`
`647`		`-let bases = vm.context().new_tuple(bases);`
`648`		`-`
`649`	`659`	`// Special case: __new__ must be looked up on the metaclass, not the meta-metaclass as`
`650`	`660`	`// per vm.call(metaclass, "__new__", ...)`
`651`	`661`	`let new = metaclass.get_attr("__new__").unwrap();`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ pub fn init(context: &PyContext) {`
`28`	`28`	`type_type.set_attr("__mro__", context.new_member_descriptor(type_mro));`
`29`	`29`	`type_type.set_attr("__class__", context.new_member_descriptor(type_new));`
`30`	`30`	`type_type.set_attr("__repr__", context.new_rustfunc(type_repr));`
	`31`	`+ type_type.set_attr("__prepare__", context.new_rustfunc(type_prepare));`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`fntype_mro(vm:&mutVirtualMachine,args:PyFuncArgs) ->PyResult{`
`@@ -291,6 +292,10 @@ fn type_repr(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`291`	`292`	`Ok(vm.new_str(format!("<class '{}'>", type_name)))`
`292`	`293`	`}`
`293`	`294`
	`295`	`+fntype_prepare(vm:&mutVirtualMachine,_args:PyFuncArgs) ->PyResult{`
	`296`	`+Ok(vm.new_dict())`
	`297`	`+}`
	`298`	`+`
`294`	`299`	`#[cfg(test)]`
`295`	`300`	`mod tests{`
`296`	`301`	`usesuper::{linearise_mro, new};`

Comments

(0)