Use PyDict_Pop()

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);

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);
         }
     }

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]

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. */

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.

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) {

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);