Fix check that __init__ must return None.

cthulahoops · cthulahoops · commit ba8990ed174a · 2018-11-03T18:09:51.000Z
diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs
@@ -121,10 +121,8 @@ pub fn type_call(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> PyResult {
 
     if let Ok(init) = vm.get_method(obj.clone(), "__init__") {
         let res = vm.invoke(init, args)?;
-        // TODO: assert that return is none?
-        if !isinstance(&res, &vm.get_none()) {
-            // panic!("__init__ must return none");
-            //     return Err(vm.new_type_error("__init__ must return None".to_string()));
+        if !res.is(&vm.get_none()) {
+            return Err(vm.new_type_error("__init__ must return None".to_string()));
         }
     }
     Ok(obj)

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,8 @@ pub fn type_call(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> PyResult {`
`121`	`121`
`122`	`122`	`if let Ok(init) = vm.get_method(obj.clone(), "__init__") {`
`123`	`123`	`let res = vm.invoke(init, args)?;`
`124`		`- // TODO: assert that return is none?`
`125`		`- if !isinstance(&res, &vm.get_none()) {`
`126`		`- // panic!("__init__ must return none");`
`127`		`- // return Err(vm.new_type_error("__init__ must return None".to_string()));`
	`124`	`+ if !res.is(&vm.get_none()) {`
	`125`	`+ return Err(vm.new_type_error("__init__ must return None".to_string()));`
`128`	`126`	`}`
`129`	`127`	`}`
`130`	`128`	`Ok(obj)`