Commit01acad0

committed

PySys_AuditTuple() now just calls PySys_Audit()

1 parenta1db71f commit01acad0Copy full SHA for 01acad0

File tree

+18

-39

lines changed

+18

-39

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -316,9 +316,8 @@ accessible to C code. They all work with the current interpreter thread's`
`316`	`316`
`317`	`317`	`..c:function::intPySys_AuditTuple(const char event, PyObject args)`
`318`	`318`
`319`		- Similar to:c:func:`PySys_Audit`, but event pass arguments as a Python
`320`		-:class:`tuple` object. args can be NULL to pass no arguments: it is
`321`		`- treated the same as passing an empty tuple.`
	`319`	+ Similar to:c:func:`PySys_Audit`, but pass arguments as a Python object. To
	`320`	`+ pass no arguments, args can be NULL.`
`322`	`321`
`323`	`322`	`..versionadded::3.13`
`324`	`323`

Lines changed: 12 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1330,30 +1330,30 @@ static int test_audit_tuple(void)`
`1330`	`1330`
`1331`	`1331`	`assert(!PyErr_Occurred());`
`1332`	`1332`
`1333`		`-// pass tuple`
	`1333`	`+// passPythontuple object`
`1334`	`1334`	`PyObject*tuple=Py_BuildValue("(i)",444);`
`1335`	`1335`	`if (tuple==NULL) {`
`1336`	`1336`	`gotoerror;`
`1337`	`1337`	`}`
`1338`	`1338`	`assert(PySys_AuditTuple("_testembed.set",tuple)==0);`
`1339`	`1339`	`assert(!PyErr_Occurred());`
`1340`		`-Py_DECREF(tuple);`
`1341`	`1340`	`assert(sawSet==444);`
	`1341`	`+Py_DECREF(tuple);`
	`1342`	`+`
	`1343`	`+// pass Python int object`
	`1344`	`+PyObject*int_arg=PyLong_FromLong(555);`
	`1345`	`+if (int_arg==NULL) {`
	`1346`	`+ gotoerror;`
	`1347`	`+ }`
	`1348`	`+assert(PySys_AuditTuple("_testembed.set",int_arg)==0);`
	`1349`	`+assert(!PyErr_Occurred());`
	`1350`	`+assert(sawSet==555);`
	`1351`	`+Py_DECREF(int_arg);`
`1342`	`1352`
`1343`	`1353`	`// NULL is accepted and means "no arguments"`
`1344`	`1354`	`assert(PySys_AuditTuple("_testembed.test_audit_tuple",NULL)==0);`
`1345`	`1355`	`assert(!PyErr_Occurred());`
`1346`	`1356`
`1347`		`-// wrong argument type`
`1348`		`-PyObject*not_tuple=PyLong_FromLong(123);`
`1349`		`-if (not_tuple==NULL) {`
`1350`		`- gotoerror;`
`1351`		`- }`
`1352`		`-assert(PySys_AuditTuple("_testembed.test_audit_tuple",not_tuple)==-1);`
`1353`		`-assert(PyErr_ExceptionMatches(PyExc_TypeError));`
`1354`		`-PyErr_Clear();`
`1355`		`-Py_DECREF(not_tuple);`
`1356`		`-`
`1357`	`1357`	`Py_Finalize();`
`1358`	`1358`	`return0;`
`1359`	`1359`

Lines changed: 4 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -378,32 +378,12 @@ PySys_Audit(const char event, const char format, ...)`
`378`	`378`	`int`
`379`	`379`	`PySys_AuditTuple(constcharevent,PyObjectargs)`
`380`	`380`	`{`
`381`		`-PyThreadState*tstate=_PyThreadState_GET();`
`382`		`-// tstate can be NULL if the function is called before Py_Initialize()`
`383`		`-if (!should_audit_tstate(tstate)) {`
`384`		`-return0;`
`385`		`- }`
`386`		`-`
`387`		`-intdelete_args=0;`
`388`		`-if (args==NULL) {`
`389`		`-delete_args=1;`
`390`		`-args=PyTuple_New(0);`
`391`		`-if (args==NULL) {`
`392`		`-return-1;`
`393`		`- }`
	`381`	`+if (args) {`
	`382`	`+returnPySys_Audit(event,"O",args);`
`394`	`383`	`}`
`395`		`-elseif (!PyTuple_Check(args)) {`
`396`		`-_PyErr_Format(tstate,PyExc_TypeError,`
`397`		`-"expected tuple, got %s",Py_TYPE(args)->tp_name);`
`398`		`-return-1;`
`399`		`- }`
`400`		`-`
`401`		`-intres=sys_audit_tuple(tstate,event,args);`
`402`		`-`
`403`		`-if (delete_args) {`
`404`		`-Py_DECREF(args);`
	`384`	`+else {`
	`385`	`+returnPySys_Audit(event,NULL);`
`405`	`386`	`}`
`406`		`-returnres;`
`407`	`387`	`}`
`408`	`388`
`409`	`389`	`/* We expose this function primarily for our own cleanup during`

Comments

(0)