Add PyDict_PopString() function

Doc/c-api/dict.rst

@@ -190,6 +190,16 @@ Dictionary Objects
 
    .. versionadded:: 3.13
 
+
+.. c:function:: int PyDict_PopString(PyObject *p, const char *key, PyObject **result)
+
+   Similar to :c:func:`PyDict_Pop`, but *key* is specified as a
+   :c:expr:`const char*` UTF-8 encoded bytes string, rather than a
+   :c:expr:`PyObject*`.
+
+   .. versionadded:: 3.13
+
+
 .. c:function:: PyObject* PyDict_Items(PyObject *p)
 
    Return a :c:type:`PyListObject` containing all the items from the dictionary.

Doc/whatsnew/3.13.rst

@@ -1164,10 +1164,10 @@ New Features
   :c:func:`PyErr_WriteUnraisable`, but allow to customize the warning mesage.
   (Contributed by Serhiy Storchaka in :gh:`108082`.)
 
-* Add :c:func:`PyDict_Pop` function: remove a key from a dictionary and
-  optionally return the removed value. This is the similar to :meth:`dict.pop`,
-  but without the default value and do not raise :exc:`KeyError` if the key
-  missing.
+* Add :c:func:`PyDict_Pop` and :c:func:`PyDict_PopString` functions: remove a
+  key from a dictionary and optionally return the removed value. This is the
+  similar to :meth:`dict.pop`, but without the default value and do not raise
+  :exc:`KeyError` if the key missing.
   (Contributed by Stefan Behnel and Victor Stinner in :gh:`111262`.)
 
 

Include/cpython/dictobject.h

@@ -47,6 +47,7 @@ static inline Py_ssize_t PyDict_GET_SIZE(PyObject *op) {
 PyAPI_FUNC(int) PyDict_ContainsString(PyObject *mp, const char *key);
 
 PyAPI_FUNC(int) PyDict_Pop(PyObject *dict, PyObject *key, PyObject **result);
+PyAPI_FUNC(int) PyDict_PopString(PyObject *dict, const char *key, PyObject **result);
 PyAPI_FUNC(PyObject *) _PyDict_Pop(PyObject *dict, PyObject *key, PyObject *default_value);
 
 /* Dictionary watchers */

Misc/NEWS.d/next/C API/2023-11-10-10-21-38.gh-issue-111262.2utB5m.rst

@@ -1,4 +1,4 @@
-Add :c:func:`PyDict_Pop` function: remove a key from a dictionary and
-optionally return the removed value. This is the similar to :meth:`dict.pop`,
-but without the default value and do not raise :exc:`KeyError` if the key
-missing. Patch by Stefan Behnel and Victor Stinner.
+Add :c:func:`PyDict_Pop` and :c:func:`PyDict_PopString` functions: remove a key
+from a dictionary and optionally return the removed value. This is the similar
+to :meth:`dict.pop`, but without the default value and do not raise
+:exc:`KeyError` if the key missing. Patch by Stefan Behnel and Victor Stinner.

Modules/socketmodule.c

@@ -392,15 +392,10 @@ remove_unusable_flags(PyObject *m)
             break;
         }
         else {
-            PyObject *flag_name = PyUnicode_FromString(win_runtime_flags[i].flag_name);
-            if (flag_name == NULL) {
+            if (PyDict_PopString(dict, win_runtime_flags[i].flag_name,
+                                 NULL) < 0) {
                 return -1;
             }
-            if (PyDict_Pop(dict, flag_name, NULL) < 0) {
-                Py_DECREF(flag_name);
-                return -1;
-            }
-            Py_DECREF(flag_name);
         }
     }
     return 0;

Objects/dictobject.c

@@ -2307,6 +2307,23 @@ PyDict_Pop(PyObject *op, PyObject *key, PyObject **result)
 }
 
 
+int
+PyDict_PopString(PyObject *op, const char *key, PyObject **result)
+{
+    PyObject *key_obj = PyUnicode_FromString(key);
+    if (key_obj == NULL) {
+        if (result != NULL) {
+            *result = NULL;
+        }
+        return -1;
+    }
+
+    int res = PyDict_Pop(op, key_obj, result);
+    Py_DECREF(key_obj);
+    return res;
+}
+
+
 PyObject *
 _PyDict_Pop(PyObject *dict, PyObject *key, PyObject *default_value)
 {

Objects/structseq.c

@@ -416,22 +416,15 @@ structseq_replace(PyStructSequence *self, PyObject *args, PyObject *kwargs)
         // We do not support types with unnamed fields, so we can iterate over
         // i >= n_visible_fields case without slicing with (i - n_unnamed_fields).
         for (i = 0; i < n_fields; ++i) {
-            PyObject *key = PyUnicode_FromString(Py_TYPE(self)->tp_members[i].name);
-            if (!key) {
-                goto error;
-            }
             PyObject *ob;
-            if (PyDict_Pop(kwargs, key, &ob) < 0) {
-                Py_DECREF(key);
+            if (PyDict_PopString(kwargs, Py_TYPE(self)->tp_members[i].name,
+                                 &ob) < 0) {
                 goto error;
             }
-            Py_DECREF(key);
-            if (ob != NULL) {
-                result->ob_item[i] = ob;
-            }
-            else {
-                result->ob_item[i] = Py_NewRef(self->ob_item[i]);
+            if (ob == NULL) {
+                ob = Py_NewRef(self->ob_item[i]);
             }
+            result->ob_item[i] = ob;
         }
         // Check if there are any unexpected fields.
         if (PyDict_GET_SIZE(kwargs) > 0) {