mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

GH-90699: Remove remaining _Py_IDENTIFIER stdlib usage (GH-99067)

Browse source
This commit is contained in:
Kumar Aditya 2022-11-08 01:36:23 +05:30 • committed by GitHub
parent 1438b77997
commit be0d5008b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 110 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Modules/_testcapimodule.c
View file

@ -13,7 +13,6 @@
#undef Py_BUILD_CORE_MODULE
#undef Py_BUILD_CORE_BUILTIN
#define NEEDS_PY_IDENTIFIER
/* Always enable assertions */
#undef NDEBUG
@ -3358,7 +3357,6 @@ test_pytime_object_to_timespec(PyObject *self, PyObject *args)
static void
slot_tp_del(PyObject *self)
{
_Py_IDENTIFIER(__tp_del__);
PyObject *del, *res;
PyObject *error_type, *error_value, *error_traceback;
@ -3369,15 +3367,20 @@ slot_tp_del(PyObject *self)
/* Save the current exception, if any. */
PyErr_Fetch(&error_type, &error_value, &error_traceback);
PyObject *tp_del = PyUnicode_InternFromString("__tp_del__");
if (tp_del == NULL) {
PyErr_WriteUnraisable(NULL);
PyErr_Restore(error_type, error_value, error_traceback);
return;
}
/* Execute __del__ method, if any. */
del = _PyObject_LookupSpecialId(self, &PyId___tp_del__);
del = _PyType_Lookup(Py_TYPE(self), tp_del);
if (del != NULL) {
res = PyObject_CallNoArgs(del);
res = PyObject_CallOneArg(del, self);
if (res == NULL)
PyErr_WriteUnraisable(del);
else
Py_DECREF(res);
Py_DECREF(del);
}
/* Restore the saved exception. */
@ -4699,7 +4702,6 @@ dict_get_version(PyObject *self, PyObject *args)
static PyObject *
raise_SIGINT_then_send_None(PyObject *self, PyObject *args)
{
_Py_IDENTIFIER(send);
PyGenObject *gen;
if (!PyArg_ParseTuple(args, "O!", &PyGen_Type, &gen))
@ -4716,7 +4718,7 @@ raise_SIGINT_then_send_None(PyObject *self, PyObject *args)
because we check for signals before every bytecode operation.
*/
raise(SIGINT);
return _PyObject_CallMethodIdOneArg((PyObject *)gen, &PyId_send, Py_None);
return PyObject_CallMethod((PyObject *)gen, "send", "O", Py_None);
}