mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-11 14:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-39465: Don't access directly _Py_Identifier members (GH-20043)

Browse source 
* Replace id->object with _PyUnicode_FromId(&id)
* Use _Py_static_string_init(str) macro to initialize statically
  name_op in typeobject.c.
This commit is contained in:
Victor Stinner 2020-05-12 01:43:38 +02:00 • committed by GitHub
parent 27c0d9b54a
commit 4804b5b3df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_cursesmodule.c
View file

@ -3814,7 +3814,7 @@ update_lines_cols(void)
return 0; return 0;
} }
/* PyId_LINES.object will be initialized here. */ /* PyId_LINES.object will be initialized here. */
if (PyDict_SetItem(ModDict, PyId_LINES.object, o)) { if (PyDict_SetItem(ModDict, _PyUnicode_FromId(&PyId_LINES), o)) {
Py_DECREF(m); Py_DECREF(m);
Py_DECREF(o); Py_DECREF(o);
return 0; return 0;
@ -3830,7 +3830,7 @@ update_lines_cols(void)
Py_DECREF(o); Py_DECREF(o);
return 0; return 0;
} }
if (PyDict_SetItem(ModDict, PyId_COLS.object, o)) { if (PyDict_SetItem(ModDict, _PyUnicode_FromId(&PyId_COLS), o)) {
Py_DECREF(m); Py_DECREF(m);
Py_DECREF(o); Py_DECREF(o);
return 0; return 0;

2
Objects/abstract.c
View file

@ -2287,7 +2287,7 @@ method_output_as_list(PyObject *o, _Py_Identifier *meth_id)
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"%.200s.%U() returned a non-iterable (type %.200s)", "%.200s.%U() returned a non-iterable (type %.200s)",
Py_TYPE(o)->tp_name, Py_TYPE(o)->tp_name,
meth_id->object, _PyUnicode_FromId(meth_id),
Py_TYPE(meth_output)->tp_name); Py_TYPE(meth_output)->tp_name);
} }
Py_DECREF(meth_output); Py_DECREF(meth_output);

14
Objects/typeobject.c
View file

@ -1519,7 +1519,7 @@ lookup_method(PyObject *self, _Py_Identifier *attrid, int *unbound)
{ {
PyObject *res = lookup_maybe_method(self, attrid, unbound); PyObject *res = lookup_maybe_method(self, attrid, unbound);
if (res == NULL && !PyErr_Occurred()) { if (res == NULL && !PyErr_Occurred()) {
PyErr_SetObject(PyExc_AttributeError, attrid->object); PyErr_SetObject(PyExc_AttributeError, _PyUnicode_FromId(attrid));
} }
return res; return res;
} }
@ -6864,12 +6864,12 @@ slot_tp_setattro(PyObject *self, PyObject *name, PyObject *value)
} }
static _Py_Identifier name_op[] = { static _Py_Identifier name_op[] = {
{0, "__lt__", 0}, _Py_static_string_init("__lt__"),
{0, "__le__", 0}, _Py_static_string_init("__le__"),
{0, "__eq__", 0}, _Py_static_string_init("__eq__"),
{0, "__ne__", 0}, _Py_static_string_init("__ne__"),
{0, "__gt__", 0}, _Py_static_string_init("__gt__"),
{0, "__ge__", 0} _Py_static_string_init("__ge__"),
}; };
static PyObject * static PyObject *

2
Python/ceval.c
View file

@ -4414,7 +4414,7 @@ special_lookup(PyThreadState *tstate, PyObject *o, _Py_Identifier *id)
PyObject *res; PyObject *res;
res = _PyObject_LookupSpecial(o, id); res = _PyObject_LookupSpecial(o, id);
if (res == NULL && !_PyErr_Occurred(tstate)) { if (res == NULL && !_PyErr_Occurred(tstate)) {
_PyErr_SetObject(tstate, PyExc_AttributeError, id->object); _PyErr_SetObject(tstate, PyExc_AttributeError, _PyUnicode_FromId(id));
return NULL; return NULL;
} }
return res; return res;