From bb1c543f4a183f5cfdf15aad59f59094d50b37fd Mon Sep 17 00:00:00 2001 From: Dong-hee Na Date: Mon, 14 Mar 2022 21:48:00 +0900 Subject: bpo-46987: Remove _PySys_GetObjectId / _PySys_GetObjectId (GH-31835) --- Include/cpython/sysmodule.h | 2 -- .../C API/2022-03-12-18-37-06.bpo-46987.LWcwyN.rst | 2 ++ Python/sysmodule.c | 36 ---------------------- 3 files changed, 2 insertions(+), 38 deletions(-) create mode 100644 Misc/NEWS.d/next/C API/2022-03-12-18-37-06.bpo-46987.LWcwyN.rst diff --git a/Include/cpython/sysmodule.h b/Include/cpython/sysmodule.h index 27dff7b..19d9ddd 100644 --- a/Include/cpython/sysmodule.h +++ b/Include/cpython/sysmodule.h @@ -4,8 +4,6 @@ PyAPI_FUNC(PyObject *) _PySys_GetAttr(PyThreadState *tstate, PyObject *name); -PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key); -PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *); PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *); diff --git a/Misc/NEWS.d/next/C API/2022-03-12-18-37-06.bpo-46987.LWcwyN.rst b/Misc/NEWS.d/next/C API/2022-03-12-18-37-06.bpo-46987.LWcwyN.rst new file mode 100644 index 0000000..2c858af --- /dev/null +++ b/Misc/NEWS.d/next/C API/2022-03-12-18-37-06.bpo-46987.LWcwyN.rst @@ -0,0 +1,2 @@ +Remove private functions ``_PySys_GetObjectId()`` and ``_PySys_SetObjectId()``. +Patch by Dong-hee Na. diff --git a/Python/sysmodule.c b/Python/sysmodule.c index a97d034..99540b0 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -73,29 +73,6 @@ _PySys_GetAttr(PyThreadState *tstate, PyObject *name) } static PyObject * -sys_get_object_id(PyThreadState *tstate, _Py_Identifier *key) -{ - PyObject *sd = tstate->interp->sysdict; - if (sd == NULL) { - return NULL; - } - PyObject *exc_type, *exc_value, *exc_tb; - _PyErr_Fetch(tstate, &exc_type, &exc_value, &exc_tb); - PyObject *value = _PyDict_GetItemIdWithError(sd, key); - /* XXX Suppress a new exception if it was raised and restore - * the old one. */ - _PyErr_Restore(tstate, exc_type, exc_value, exc_tb); - return value; -} - -PyObject * -_PySys_GetObjectId(_Py_Identifier *key) -{ - PyThreadState *tstate = _PyThreadState_GET(); - return sys_get_object_id(tstate, key); -} - -static PyObject * _PySys_GetObject(PyInterpreterState *interp, const char *name) { PyObject *sysdict = interp->sysdict; @@ -139,19 +116,6 @@ sys_set_object(PyInterpreterState *interp, PyObject *key, PyObject *v) } } -static int -sys_set_object_id(PyInterpreterState *interp, _Py_Identifier *key, PyObject *v) -{ - return sys_set_object(interp, _PyUnicode_FromId(key), v); -} - -int -_PySys_SetObjectId(_Py_Identifier *key, PyObject *v) -{ - PyInterpreterState *interp = _PyInterpreterState_GET(); - return sys_set_object_id(interp, key, v); -} - int _PySys_SetAttr(PyObject *key, PyObject *v) { -- cgit v0.12