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

scoder · scoder · commit ce6b210a6e8e · 2023-10-24T15:22:21.000+02:00
See python#108449
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/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)
