From 87cd1ab98358d2b0de4a873324858a282c3ad251 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sun, 14 Mar 2021 04:04:47 +0100 Subject: [PATCH 1/4] [3.9] bpo-43439: Wrapt the tuple in the audit events for the gc module (GH-24836). (cherry picked from commit 9c376bc1c4c8bcddb0bc4196b79ec8c75da494a8) Co-authored-by: Pablo Galindo --- Modules/gcmodule.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index 52443debb12503..7cd55d7d35addc 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -1672,10 +1672,10 @@ Return the list of objects that directly refer to any of objs."); static PyObject * gc_get_referrers(PyObject *self, PyObject *args) { +<<<<<<< HEAD PyThreadState *tstate = _PyThreadState_GET(); - int i; - if (PySys_Audit("gc.get_referrers", "O", args) < 0) { + if (PySys_Audit("gc.get_referrers", "(O)", args) < 0) { return NULL; } @@ -1709,7 +1709,7 @@ static PyObject * gc_get_referents(PyObject *self, PyObject *args) { Py_ssize_t i; - if (PySys_Audit("gc.get_referents", "O", args) < 0) { + if (PySys_Audit("gc.get_referents", "(O)", args) < 0) { return NULL; } PyObject *result = PyList_New(0); From 798b793e5797df342ad6d7fef8264f99ac11a0ef Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sun, 14 Mar 2021 04:30:59 +0000 Subject: [PATCH 2/4] Update gcmodule.c --- Modules/gcmodule.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index 7cd55d7d35addc..2db3123e132041 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -1672,7 +1672,6 @@ Return the list of objects that directly refer to any of objs."); static PyObject * gc_get_referrers(PyObject *self, PyObject *args) { -<<<<<<< HEAD PyThreadState *tstate = _PyThreadState_GET(); if (PySys_Audit("gc.get_referrers", "(O)", args) < 0) { From 1f717bbcc6ef17c85d2ed99a560c13a3c9d32e2f Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sun, 14 Mar 2021 04:31:30 +0000 Subject: [PATCH 3/4] Update gcmodule.c --- Modules/gcmodule.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index 2db3123e132041..d0fa621aea7905 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -1672,6 +1672,7 @@ Return the list of objects that directly refer to any of objs."); static PyObject * gc_get_referrers(PyObject *self, PyObject *args) { + int i; PyThreadState *tstate = _PyThreadState_GET(); if (PySys_Audit("gc.get_referrers", "(O)", args) < 0) { From 298eb02034f0d400f6c823c08cdb56d58880e8c2 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Sun, 14 Mar 2021 04:32:00 +0000 Subject: [PATCH 4/4] Update gcmodule.c --- Modules/gcmodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index d0fa621aea7905..2c6ef9252eae86 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -1672,8 +1672,8 @@ Return the list of objects that directly refer to any of objs."); static PyObject * gc_get_referrers(PyObject *self, PyObject *args) { - int i; PyThreadState *tstate = _PyThreadState_GET(); + int i; if (PySys_Audit("gc.get_referrers", "(O)", args) < 0) { return NULL;