pythongh-111262: Re-add _PyDict_Pop() to have a C-API until a new public one is designed.

scoder · scoder · commit 794eb8a4bfe8 · 2023-10-25T10:08:16.000+02:00
diff --git a/Include/cpython/dictobject.h b/Include/cpython/dictobject.h
@@ -46,6 +46,7 @@ static inline Py_ssize_t PyDict_GET_SIZE(PyObject *op) {
 
 PyAPI_FUNC(int) PyDict_ContainsString(PyObject *mp, const char *key);
 
+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
@@ -49,9 +49,6 @@ extern PyObject* _PyDict_NewPresized(Py_ssize_t minused);
 // Export for '_ctypes' shared extension
 PyAPI_FUNC(Py_ssize_t) _PyDict_SizeOf(PyDictObject *);
 
-// Export for '_socket' shared extension (Windows remove_unusable_flags())
-PyAPI_FUNC(PyObject*) _PyDict_Pop(PyObject *, PyObject *, PyObject *);
-
 #define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
 
 /* Like PyDict_Merge, but override can be 0, 1 or 2.  If override is 0,
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
@@ -3,7 +3,6 @@
 /* Interface to Sjoerd's portable C thread library */
 
 #include "Python.h"
-#include "pycore_dict.h"          // _PyDict_Pop()
 #include "pycore_interp.h"        // _PyInterpreterState.threads.count
 #include "pycore_moduleobject.h"  // _PyModule_GetState()
 #include "pycore_pyerrors.h"      // _PyErr_WriteUnraisableMsg()
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -107,7 +107,6 @@ Local naming conventions:
 
 #include "Python.h"
 #include "pycore_capsule.h"       // _PyCapsule_SetTraverse()
-#include "pycore_dict.h"          // _PyDict_Pop()
 #include "pycore_fileutils.h"     // _Py_set_inheritable()
 #include "pycore_moduleobject.h"  // _PyModule_GetState
 
diff --git a/Python/import.c b/Python/import.c
@@ -1,7 +1,6 @@
 /* Module definition and import implementation */
 
 #include "Python.h"
-#include "pycore_dict.h"          // _PyDict_Pop()
 #include "pycore_hashtable.h"     // _Py_hashtable_new_full()
 #include "pycore_import.h"        // _PyImport_BootstrapImp()
 #include "pycore_initconfig.h"    // _PyStatus_OK()

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ static inline Py_ssize_t PyDict_GET_SIZE(PyObject *op) {`
`46`	`46`
`47`	`47`	`PyAPI_FUNC(int) PyDict_ContainsString(PyObject mp, const char key);`
`48`	`48`
	`49`	`+PyAPI_FUNC(PyObject ) _PyDict_Pop(PyObject dict, PyObject key, PyObject default_value);`
`49`	`50`
`50`	`51`	`/* Dictionary watchers */`
`51`	`52`