pythongh-106320: Make some PyDict C-API functions public that should have been public right away.

scoder · scoder · commit b3dd0678e3bf · 2023-10-24T15:47:54.000+02:00
See python#108449
diff --git a/Doc/c-api/dict.rst b/Doc/c-api/dict.rst
@@ -36,6 +36,14 @@ Dictionary Objects
    Return a new empty dictionary, or ``NULL`` on failure.
 
 
+.. c:function:: PyObject* PyDict_NewPresized(Py_ssize_t minused)
+
+   This is the same as :c:func:`PyDict_New`, but makes sure that the dict can
+   efficiently store at least *minused* entries without reallocation.
+
+   .. versionadded:: 3.13
+
+
 .. c:function:: PyObject* PyDictProxy_New(PyObject *mapping)
 
    Return a :class:`types.MappingProxyType` object for a mapping which
@@ -173,6 +181,16 @@ Dictionary Objects
 
    .. versionadded:: 3.4
 
+
+.. c:function:: PyObject* PyDict_Pop(PyObject *p, PyObject *key, PyObject *defaultobj)
+
+   This is the same as the Python-level :meth:`dict.pop`.  It removes the *key*
+   from the dictionary *p* and returns its value.  If the key is not in the dict,
+   the value *defaultobj* is returned instead if it is not ``NULL``, or a
+   :exc:`KeyError` is raised if it is ``NULL``.
+
+   .. versionadded:: 3.13
+
 .. c:function:: PyObject* PyDict_Items(PyObject *p)
 
    Return a :c:type:`PyListObject` containing all the items from the dictionary.
diff --git a/Include/cpython/dictobject.h b/Include/cpython/dictobject.h
@@ -45,7 +45,8 @@ static inline Py_ssize_t PyDict_GET_SIZE(PyObject *op) {
 #define PyDict_GET_SIZE(op) PyDict_GET_SIZE(_PyObject_CAST(op))
 
 PyAPI_FUNC(int) PyDict_ContainsString(PyObject *mp, const char *key);
-
+PyAPI_FUNC(PyObject *) PyDict_NewPresized(Py_ssize_t minused);
+PyAPI_FUNC(PyObject *) PyDict_Pop(PyObject *dict, PyObject *key, PyObject *default_value);
 
 /* Dictionary watchers */
 
diff --git a/Include/internal/pycore_dict.h b/Include/internal/pycore_dict.h
@@ -44,8 +44,6 @@ extern int _PyDict_HasOnlyStringKeys(PyObject *mp);
 
 extern void _PyDict_MaybeUntrack(PyObject *mp);
 
-extern PyObject* _PyDict_NewPresized(Py_ssize_t minused);
-
 // Export for '_ctypes' shared extension
 PyAPI_FUNC(Py_ssize_t) _PyDict_SizeOf(PyDictObject *);
 
diff --git a/Misc/NEWS.d/next/C API/2023-10-24-12-12-44.gh-issue-106320.UkK3x-.rst b/Misc/NEWS.d/next/C API/2023-10-24-12-12-44.gh-issue-106320.UkK3x-.rst
@@ -0,0 +1,2 @@
+Add new C-API functions PyDict_NewPresized and PyDict_Pop
+to replace previously removed underscore functions.
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -1608,7 +1608,7 @@ dict_new_presized(PyInterpreterState *interp, Py_ssize_t minused, bool unicode)
 }
 
 PyObject *
-_PyDict_NewPresized(Py_ssize_t minused)
+PyDict_NewPresized(Py_ssize_t minused)
 {
     PyInterpreterState *interp = _PyInterpreterState_GET();
     return dict_new_presized(interp, minused, false);
@@ -2272,6 +2272,16 @@ _PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt)
     return _PyDict_Pop_KnownHash(dict, key, hash, deflt);
 }
 
+PyObject *
+PyDict_Pop(PyObject *dict, PyObject *key, PyObject *deflt)
+{
+    if (!PyDict_Check(dict)) {
+        PyErr_BadInternalCall();
+        return -1;
+    }
+    return _PyDict_Pop(dict, key, deflt);
+}
+
 /* Internal version of dict.from_keys().  It is subclass-friendly. */
 PyObject *
 _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Add new C-API functions PyDict_NewPresized and PyDict_Pop`
	`2`	`+to replace previously removed underscore functions.`