mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-46541: Remove usage of _Py_IDENTIFIER from pyexpat (GH-31468)

Browse source
This commit is contained in:
Dong-hee Na 2022-02-21 23:46:52 +09:00 • committed by GitHub
parent 195a46d6ff
commit 2b86616456
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/pyexpat.c
View file

@ -1,5 +1,3 @@
#define NEEDS_PY_IDENTIFIER
#include "Python.h" #include "Python.h"
#include <ctype.h> #include <ctype.h>
@ -52,6 +50,7 @@ enum HandlerTypes {
typedef struct { typedef struct {
PyTypeObject *xml_parse_type; PyTypeObject *xml_parse_type;
PyObject *error; PyObject *error;
PyObject *str_read;
} pyexpat_state; } pyexpat_state;
static inline pyexpat_state* static inline pyexpat_state*
@ -824,11 +823,10 @@ pyexpat_xmlparser_ParseFile_impl(xmlparseobject *self, PyTypeObject *cls,
{ {
int rv = 1; int rv = 1;
PyObject *readmethod = NULL; PyObject *readmethod = NULL;
_Py_IDENTIFIER(read);
pyexpat_state *state = PyType_GetModuleState(cls); pyexpat_state *state = PyType_GetModuleState(cls);
if (_PyObject_LookupAttrId(file, &PyId_read, &readmethod) < 0) { if (_PyObject_LookupAttr(file, state->str_read, &readmethod) < 0) {
return NULL; return NULL;
} }
if (readmethod == NULL) { if (readmethod == NULL) {
@ -1898,6 +1896,10 @@ static int
pyexpat_exec(PyObject *mod) pyexpat_exec(PyObject *mod)
{ {
pyexpat_state *state = pyexpat_get_state(mod); pyexpat_state *state = pyexpat_get_state(mod);
state->str_read = PyUnicode_InternFromString("read");
if (state->str_read == NULL) {
return -1;
}
state->xml_parse_type = (PyTypeObject *)PyType_FromModuleAndSpec( state->xml_parse_type = (PyTypeObject *)PyType_FromModuleAndSpec(
mod, &_xml_parse_type_spec, NULL); mod, &_xml_parse_type_spec, NULL);
@ -2034,6 +2036,7 @@ pyexpat_traverse(PyObject *module, visitproc visit, void *arg)
pyexpat_state *state = pyexpat_get_state(module); pyexpat_state *state = pyexpat_get_state(module);
Py_VISIT(state->xml_parse_type); Py_VISIT(state->xml_parse_type);
Py_VISIT(state->error); Py_VISIT(state->error);
Py_VISIT(state->str_read);
return 0; return 0;
} }
@ -2043,6 +2046,7 @@ pyexpat_clear(PyObject *module)
pyexpat_state *state = pyexpat_get_state(module); pyexpat_state *state = pyexpat_get_state(module);
Py_CLEAR(state->xml_parse_type); Py_CLEAR(state->xml_parse_type);
Py_CLEAR(state->error); Py_CLEAR(state->error);
Py_CLEAR(state->str_read);
return 0; return 0;
} }