mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
gh-106320: Remove _PyDict_GetItemStringWithError() function (#108313)
Remove private _PyDict_GetItemStringWithError() function of the public C API: the new PyDict_GetItemStringRef() can be used instead. * Move private _PyDict_GetItemStringWithError() to the internal C API. * _testcapi get_code_extra_index() uses PyDict_GetItemStringRef(). Avoid using private functions in _testcapi which tests the public C API.
This commit is contained in:
parent
0cb0c238d5
commit
615f6e946d
8 changed files with 12 additions and 6 deletions
|
@ -9,12 +9,12 @@ get_code_extra_index(PyInterpreterState* interp) {
|
|||
PyObject *interp_dict = PyInterpreterState_GetDict(interp); // borrowed
|
||||
assert(interp_dict); // real users would handle missing dict... somehow
|
||||
|
||||
PyObject *index_obj = _PyDict_GetItemStringWithError(interp_dict, key); // borrowed
|
||||
PyObject *index_obj;
|
||||
if (PyDict_GetItemStringRef(interp_dict, key, &index_obj) < 0) {
|
||||
goto finally;
|
||||
}
|
||||
Py_ssize_t index = 0;
|
||||
if (!index_obj) {
|
||||
if (PyErr_Occurred()) {
|
||||
goto finally;
|
||||
}
|
||||
index = PyUnstable_Eval_RequestCodeExtraIndex(NULL);
|
||||
if (index < 0 || PyErr_Occurred()) {
|
||||
goto finally;
|
||||
|
@ -31,6 +31,7 @@ get_code_extra_index(PyInterpreterState* interp) {
|
|||
}
|
||||
else {
|
||||
index = PyLong_AsSsize_t(index_obj);
|
||||
Py_DECREF(index_obj);
|
||||
if (index == -1 && PyErr_Occurred()) {
|
||||
goto finally;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue