Commita2ce4c8

committed

Add special case handling for __get__(None, NoneType)

1 parent7bf8378 commita2ce4c8Copy full SHA for a2ce4c8

File tree

+17

-15

lines changed

+17

-15

lines changed

Lines changed: 14 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`usesuper::super::pyobject::{`
`2`		`-AttributeProtocol,PyContext,PyFuncArgs,PyObject,PyObjectKind,PyObjectRef,PyResult,`
`3`		`-TypeProtocol,`
	`2`	`+AttributeProtocol,IdProtocol,PyContext,PyFuncArgs,PyObject,PyObjectKind,PyObjectRef,`
	`3`	`+PyResult,TypeProtocol,`
`4`	`4`	`};`
`5`	`5`	`usesuper::super::vm::VirtualMachine;`
`6`	`6`	`usesuper::objtype;`
`@@ -22,7 +22,17 @@ pub fn init(context: &PyContext) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`fnbind_method(vm:&mutVirtualMachine,args:PyFuncArgs) ->PyResult{`
`25`		`-Ok(vm.new_bound_method(args.args[0].clone(), args.args[1].clone()))`
	`25`	`+arg_check!(`
	`26`	`+ vm,`
	`27`	`+ args,`
	`28`	`+ required =[(function,None),(obj,None),(cls,None)]`
	`29`	`+);`
	`30`	`+`
	`31`	`+if obj.is(&vm.get_none()) && !cls.is(&obj.typ()){`
	`32`	`+Ok(function.clone())`
	`33`	`+}else{`
	`34`	`+Ok(vm.ctx.new_bound_method(function.clone(), obj.clone()))`
	`35`	`+}`
`26`	`36`	`}`
`27`	`37`
`28`	`38`	`fnmember_get(vm:&mutVirtualMachine,mutargs:PyFuncArgs) ->PyResult{`
`@@ -50,7 +60,7 @@ fn classmethod_get(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`50`	`60`	`match cls.get_attr("function"){`
`51`	`61`	`Some(function) =>{`
`52`	`62`	`let py_obj = owner.clone();`
`53`		`-let py_method = vm.new_bound_method(function, py_obj);`
	`63`	`+let py_method = vm.ctx.new_bound_method(function, py_obj);`
`54`	`64`	`Ok(py_method)`
`55`	`65`	`}`
`56`	`66`	`None =>{`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ fn property_get(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`31`	`31`
`32`	`32`	`match cls.get_attr("fget"){`
`33`	`33`	`Some(getter) =>{`
`34`		`-let py_method = vm.new_bound_method(getter, inst.clone());`
	`34`	`+let py_method = vm.ctx.new_bound_method(getter, inst.clone());`
`35`	`35`	`vm.invoke(py_method,PyFuncArgs::default())`
`36`	`36`	`}`
`37`	`37`	`None =>{`

Lines changed: 2 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ use super::obj::objsequence;`
`17`	`17`	`usesuper::obj::objstr;`
`18`	`18`	`usesuper::obj::objtype;`
`19`	`19`	`usesuper::pyobject::{`
`20`		`-AttributeProtocol,DictProtocol,IdProtocol,PyContext,PyFuncArgs,PyObjectKind,PyObjectRef,`
`21`		`-PyResult,TypeProtocol,`
	`20`	`+AttributeProtocol,DictProtocol,PyContext,PyFuncArgs,PyObjectKind,PyObjectRef,PyResult,`
	`21`	`+TypeProtocol,`
`22`	`22`	`};`
`23`	`23`	`usesuper::stdlib;`
`24`	`24`	`usesuper::sysmodule;`
`@@ -92,14 +92,6 @@ impl VirtualMachine {`
`92`	`92`	`self.ctx.none()`
`93`	`93`	`}`
`94`	`94`
`95`		`-pubfnnew_bound_method(&self,function:PyObjectRef,object:PyObjectRef) ->PyObjectRef{`
`96`		`-if object.is(&self.get_none()){`
`97`		`- function`
`98`		`-}else{`
`99`		`-self.ctx.new_bound_method(function, object)`
`100`		`-}`
`101`		`-}`
`102`		`-`
`103`	`95`	`pubfnget_type(&self) ->PyObjectRef{`
`104`	`96`	`self.ctx.type_type()`
`105`	`97`	`}`

Comments

(0)