Commit6548c36

committed

Use check_but_allow_none for exec/eval.

1 parent4dd0304 commit6548c36Copy full SHA for 6548c36

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,12 @@`
`10`	`10`	`exec("assert 4 == x", {'x':2}, {'x':4})`
`11`	`11`
`12`	`12`	`exec("assert max(1, 2) == 2", {}, {})`
	`13`	`+`
	`14`	`+exec("max(1, 5, square(5)) == 25",None)`
	`15`	`+`
	`16`	`+try:`
	`17`	`+exec("",1)`
	`18`	`+exceptTypeError:`
	`19`	`+pass`
	`20`	`+else:`
	`21`	`+raiseTypeError("exec should fail unless globals is a dict or None")`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,12 +190,11 @@ fn builtin_eval(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`190`	`190`	`vm,`
`191`	`191`	`args,`
`192`	`192`	`required =[(source,None)],`
`193`		`- optional =[`
`194`		`-(globals,Some(vm.ctx.dict_type())),`
`195`		`-(locals,Some(vm.ctx.dict_type()))`
`196`		`-]`
	`193`	`+ optional =[(globals,None),(locals,Some(vm.ctx.dict_type()))]`
`197`	`194`	`);`
`198`	`195`
	`196`	`+check_but_allow_none!(vm, globals, vm.ctx.dict_type());`
	`197`	`+`
`199`	`198`	`// Determine code object:`
`200`	`199`	`let code_obj =if objtype::isinstance(source,&vm.ctx.code_type()){`
`201`	`200`	`source.clone()`
`@@ -227,12 +226,11 @@ fn builtin_exec(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {`
`227`	`226`	`vm,`
`228`	`227`	`args,`
`229`	`228`	`required =[(source,None)],`
`230`		`- optional =[`
`231`		`-(globals,Some(vm.ctx.dict_type())),`
`232`		`-(locals,Some(vm.ctx.dict_type()))`
`233`		`-]`
	`229`	`+ optional =[(globals,None),(locals,Some(vm.ctx.dict_type()))]`
`234`	`230`	`);`
`235`	`231`
	`232`	`+check_but_allow_none!(vm, globals, vm.ctx.dict_type());`
	`233`	`+`
`236`	`234`	`// Determine code object:`
`237`	`235`	`let code_obj =if objtype::isinstance(source,&vm.ctx.str_type()){`
`238`	`236`	`let mode = compile::Mode::Exec;`

Comments

(0)