Use PyDict_Pop()

vstinner · vstinner · commit 3d37d990937e · 2023-11-13T00:26:30.000+01:00
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
@@ -967,12 +967,12 @@ local_clear(localobject *self)
         HEAD_UNLOCK(runtime);
         while (tstate) {
             if (tstate->dict) {
-                PyObject *v = _PyDict_Pop(tstate->dict, self->key, Py_None);
-                if (v != NULL) {
-                    Py_DECREF(v);
+                PyObject *v;
+                if (PyDict_Pop(tstate->dict, self->key, Py_None, &v) < 0) {
+                    PyErr_Clear();
                 }
                 else {
-                    PyErr_Clear();
+                    Py_DECREF(v);
                 }
             }
             HEAD_LOCK(runtime);
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -396,11 +396,12 @@ remove_unusable_flags(PyObject *m)
             if (flag_name == NULL) {
                 return -1;
             }
-            PyObject *v = _PyDict_Pop(dict, flag_name, Py_None);
-            Py_DECREF(flag_name);
-            if (v == NULL) {
+            PyObject *v;
+            if (PyDict_Pop(dict, flag_name, Py_None, &v) < 0) {
+                Py_DECREF(flag_name);
                 return -1;
             }
+            Py_DECREF(flag_name);
             Py_DECREF(v);
         }
     }
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -3493,7 +3493,9 @@ static PyObject *
 dict_pop_impl(PyDictObject *self, PyObject *key, PyObject *default_value)
 /*[clinic end generated code: output=3abb47b89f24c21c input=e221baa01044c44c]*/
 {
-    return _PyDict_Pop((PyObject*)self, key, default_value);
+    PyObject *result;
+    PyDict_Pop((PyObject*)self, key, default_value, &result);
+    return result;
 }
 
 /*[clinic input]
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
@@ -1049,7 +1049,8 @@ _odict_popkey_hash(PyObject *od, PyObject *key, PyObject *failobj,
             return NULL;
         }
         /* Now delete the value from the dict. */
-        (void)_PyDict_Pop_KnownHash((PyDictObject *)od, key, hash, failobj, &value);
+        (void)_PyDict_Pop_KnownHash((PyDictObject *)od, key, hash,
+                                    failobj, &value);
     }
     else if (value == NULL && !PyErr_Occurred()) {
         /* Apply the fallback value, if necessary. */
diff --git a/Objects/structseq.c b/Objects/structseq.c
@@ -8,7 +8,6 @@
 */
 
 #include "Python.h"
-#include "pycore_dict.h"          // _PyDict_Pop()
 #include "pycore_initconfig.h"    // _PyStatus_OK()
 #include "pycore_modsupport.h"    // _PyArg_NoPositional()
 #include "pycore_object.h"        // _PyObject_GC_TRACK()
@@ -421,11 +420,12 @@ structseq_replace(PyStructSequence *self, PyObject *args, PyObject *kwargs)
             if (!key) {
                 goto error;
             }
-            PyObject *ob = _PyDict_Pop(kwargs, key, self->ob_item[i]);
-            Py_DECREF(key);
-            if (!ob) {
+            PyObject *ob;
+            if (PyDict_Pop(kwargs, key, self->ob_item[i], &ob) < 0) {
+                Py_DECREF(key);
                 goto error;
             }
+            Py_DECREF(key);
             result->ob_item[i] = ob;
         }
         // Check if there are any unexpected fields.
diff --git a/Python/import.c b/Python/import.c
@@ -395,7 +395,8 @@ remove_module(PyThreadState *tstate, PyObject *name)
 
     PyObject *modules = MODULES(tstate->interp);
     if (PyDict_CheckExact(modules)) {
-        PyObject *mod = _PyDict_Pop(modules, name, Py_None);
+        PyObject *mod;
+        (void)PyDict_Pop(modules, name, Py_None, &mod);
         Py_XDECREF(mod);
     }
     else if (PyMapping_DelItem(modules, name) < 0) {
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -125,8 +125,7 @@ sys_set_object(PyInterpreterState *interp, PyObject *key, PyObject *v)
     }
     PyObject *sd = interp->sysdict;
     if (v == NULL) {
-        v = _PyDict_Pop(sd, key, Py_None);
-        if (v == NULL) {
+        if (PyDict_Pop(sd, key, Py_None, &v) < 0) {
             return -1;
         }
         Py_DECREF(v);

Original file line number	Diff line number	Diff line change
`@@ -967,12 +967,12 @@ local_clear(localobject *self)`
`967`	`967`	`HEAD_UNLOCK(runtime);`
`968`	`968`	`while (tstate) {`
`969`	`969`	`if (tstate->dict) {`
`970`		`- PyObject *v = _PyDict_Pop(tstate->dict, self->key, Py_None);`
`971`		`- if (v != NULL) {`
`972`		`- Py_DECREF(v);`
	`970`	`+ PyObject *v;`
	`971`	`+ if (PyDict_Pop(tstate->dict, self->key, Py_None, &v) < 0) {`
	`972`	`+ PyErr_Clear();`
`973`	`973`	`}`
`974`	`974`	`else {`
`975`		`- PyErr_Clear();`
	`975`	`+ Py_DECREF(v);`
`976`	`976`	`}`
`977`	`977`	`}`
`978`	`978`	`HEAD_LOCK(runtime);`
Original file line number	Diff line number	Diff line change
`@@ -396,11 +396,12 @@ remove_unusable_flags(PyObject *m)`
`396`	`396`	`if (flag_name == NULL) {`
`397`	`397`	`return -1;`
`398`	`398`	`}`
`399`		`- PyObject *v = _PyDict_Pop(dict, flag_name, Py_None);`
`400`		`- Py_DECREF(flag_name);`
`401`		`- if (v == NULL) {`
	`399`	`+ PyObject *v;`
	`400`	`+ if (PyDict_Pop(dict, flag_name, Py_None, &v) < 0) {`
	`401`	`+ Py_DECREF(flag_name);`
`402`	`402`	`return -1;`
`403`	`403`	`}`
	`404`	`+ Py_DECREF(flag_name);`
`404`	`405`	`Py_DECREF(v);`
`405`	`406`	`}`
`406`	`407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3493,7 +3493,9 @@ static PyObject *`
`3493`	`3493`	`dict_pop_impl(PyDictObject self, PyObject key, PyObject *default_value)`
`3494`	`3494`	`/[clinic end generated code: output=3abb47b89f24c21c input=e221baa01044c44c]/`
`3495`	`3495`	`{`
`3496`		`- return _PyDict_Pop((PyObject*)self, key, default_value);`
	`3496`	`+ PyObject *result;`
	`3497`	`+ PyDict_Pop((PyObject*)self, key, default_value, &result);`
	`3498`	`+ return result;`
`3497`	`3499`	`}`
`3498`	`3500`
`3499`	`3501`	`/*[clinic input]`
Original file line number	Diff line number	Diff line change
`@@ -1049,7 +1049,8 @@ _odict_popkey_hash(PyObject od, PyObject key, PyObject *failobj,`
`1049`	`1049`	`return NULL;`
`1050`	`1050`	`}`
`1051`	`1051`	`/* Now delete the value from the dict. */`
`1052`		`- (void)_PyDict_Pop_KnownHash((PyDictObject *)od, key, hash, failobj, &value);`
	`1052`	`+ (void)_PyDict_Pop_KnownHash((PyDictObject *)od, key, hash,`
	`1053`	`+ failobj, &value);`
`1053`	`1054`	`}`
`1054`	`1055`	`else if (value == NULL && !PyErr_Occurred()) {`
`1055`	`1056`	`/* Apply the fallback value, if necessary. */`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,8 @@ remove_module(PyThreadState tstate, PyObject name)`
`395`	`395`
`396`	`396`	`PyObject *modules = MODULES(tstate->interp);`
`397`	`397`	`if (PyDict_CheckExact(modules)) {`
`398`		`- PyObject *mod = _PyDict_Pop(modules, name, Py_None);`
	`398`	`+ PyObject *mod;`
	`399`	`+ (void)PyDict_Pop(modules, name, Py_None, &mod);`
`399`	`400`	`Py_XDECREF(mod);`
`400`	`401`	`}`
`401`	`402`	`else if (PyMapping_DelItem(modules, name) < 0) {`
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,7 @@ sys_set_object(PyInterpreterState interp, PyObject key, PyObject *v)`
`125`	`125`	`}`
`126`	`126`	`PyObject *sd = interp->sysdict;`
`127`	`127`	`if (v == NULL) {`
`128`		`- v = _PyDict_Pop(sd, key, Py_None);`
`129`		`- if (v == NULL) {`
	`128`	`+ if (PyDict_Pop(sd, key, Py_None, &v) < 0) {`
`130`	`129`	`return -1;`
`131`	`130`	`}`
`132`	`131`	`Py_DECREF(v);`