mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

bpo-46987: Remove _PySys_GetObjectId / _PySys_GetObjectId (GH-31835)

Browse source
This commit is contained in:
Dong-hee Na 2022-03-14 21:48:00 +09:00 • committed by GitHub
parent 9523c0d84f
commit bb1c543f4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/cpython/sysmodule.h
View file

@ -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 *);

2
Misc/NEWS.d/next/C API/2022-03-12-18-37-06.bpo-46987.LWcwyN.rst Normal file
View file

@ -0,0 +1,2 @@
Remove private functions ``_PySys_GetObjectId()`` and ``_PySys_SetObjectId()``.
Patch by Dong-hee Na.

36
Python/sysmodule.c
View file

@ -72,29 +72,6 @@ _PySys_GetAttr(PyThreadState *tstate, PyObject *name)
return value;
}
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)
{
@ -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)
{