Commita04c14f

committed

restrict keyword placeholders

1 parentd217592 commita04c14fCopy full SHA for a04c14f

File tree

+27

-15

lines changed

+27

-15

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,10 @@ class partial:`
`342`	`342`	`def__new__(cls,func,/,args,*keywords):`
`343`	`343`	`ifnotcallable(func):`
`344`	`344`	`raiseTypeError("the first argument must be callable")`
	`345`	`+ifkeywords:`
	`346`	`+forvinkeywords.values():`
	`347`	`+ifvisPlaceholder:`
	`348`	`+raiseTypeError("keyword Placeholders are not allowed")`
`345`	`349`	`ifisinstance(func,partial):`
`346`	`350`	`pto_phcount=func._phcount`
`347`	`351`	`tot_args=func.args`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,12 @@ def test_placeholders_optimization(self):`
`254`	`254`	`self.assertEqual(p2.args, (PH,0))`
`255`	`255`	`self.assertEqual(p2(1), ((1,0), {}))`
`256`	`256`
	`257`	`+deftest_placeholders_kw_restriction(self):`
	`258`	`+PH=self.module.Placeholder`
	`259`	`+exc_string='keyword Placeholders are not allowed'`
	`260`	`+withself.assertRaisesRegex(TypeError,exc_string):`
	`261`	`+self.partial(capture,a=PH)`
	`262`	`+`
`257`	`263`	`deftest_construct_placeholder_singleton(self):`
`258`	`264`	`PH=self.module.Placeholder`
`259`	`265`	`tp=type(PH)`

Lines changed: 17 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -290,29 +290,31 @@ partial_new(PyTypeObject type, PyObject args, PyObject *kw)`
`290`	`290`
`291`	`291`	`/* process keywords */`
`292`	`292`	`if (pto_kw==NULL\|\|PyDict_GET_SIZE(pto_kw)==0) {`
`293`		`-if (kw==NULL) {`
`294`		`-pto->kw=PyDict_New();`
`295`		`- }`
`296`		`-elseif (Py_REFCNT(kw)==1) {`
`297`		`-pto->kw=Py_NewRef(kw);`
`298`		`- }`
`299`		`-else {`
`300`		`-pto->kw=PyDict_Copy(kw);`
`301`		`- }`
	`293`	`+pto->kw=PyDict_New();`
`302`	`294`	`}`
`303`	`295`	`else {`
`304`	`296`	`pto->kw=PyDict_Copy(pto_kw);`
`305`		`-if (kw!=NULL&&pto->kw!=NULL) {`
`306`		`-if (PyDict_Merge(pto->kw,kw,1)!=0) {`
	`297`	`+if (pto->kw==NULL) {`
	`298`	`+Py_DECREF(pto);`
	`299`	`+returnNULL;`
	`300`	`+ }`
	`301`	`+ }`
	`302`	`+if (kw!=NULL&&pto->kw!=NULL) {`
	`303`	`+PyObjectkey,val;`
	`304`	`+Py_ssize_tpos=0;`
	`305`	`+while (PyDict_Next(kw,&pos,&key,&val)) {`
	`306`	`+if (val==phold) {`
	`307`	`+Py_DECREF(pto);`
	`308`	`+PyErr_SetString(PyExc_TypeError,`
	`309`	`+"keyword Placeholders are not allowed");`
	`310`	`+returnNULL;`
	`311`	`+ }`
	`312`	`+if (PyDict_SetItem(pto->kw,key,val)) {`
`307`	`313`	`Py_DECREF(pto);`
`308`	`314`	`returnNULL;`
`309`	`315`	`}`
`310`	`316`	`}`
`311`	`317`	`}`
`312`		`-if (pto->kw==NULL) {`
`313`		`-Py_DECREF(pto);`
`314`		`-returnNULL;`
`315`		`- }`
`316`	`318`
`317`	`319`	`partial_setvectorcall(pto);`
`318`	`320`	`return (PyObject*)pto;`

Comments

(0)