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

_elementtree.XMLParser._setevents should support any sequence, not just tuples

Browse source 
Also clean up some code around this
This commit is contained in:
Eli Bendersky 2013-05-19 09:01:49 -07:00
parent 5b6616dee3
commit 3a4fbd8241
3 changed files with 94 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

88
Modules/_elementtree.c
View file

@ -3431,14 +3431,14 @@ static PyObject*
xmlparser_setevents(XMLParserObject *self, PyObject* args)
{
/* activate element event reporting */
Py_ssize_t i, seqlen;
TreeBuilderObject *target;
Py_ssize_t i;
TreeBuilderObject* target;
PyObject* events; /* event collector */
PyObject* event_set = Py_None;
if (!PyArg_ParseTuple(args, "O!|O:_setevents", &PyList_Type, &events,
&event_set))
PyObject *events_queue;
PyObject *events_to_report = Py_None;
PyObject *events_seq;
if (!PyArg_ParseTuple(args, "O!|O:_setevents", &PyList_Type, &events_queue,
&events_to_report))
return NULL;
if (!TreeBuilder_CheckExact(self->target)) {
@ -3452,9 +3452,9 @@ xmlparser_setevents(XMLParserObject *self, PyObject* args)
target = (TreeBuilderObject*) self->target;
Py_INCREF(events);
Py_INCREF(events_queue);
Py_XDECREF(target->events);
target->events = events;
target->events = events_queue;
/* clear out existing events */
Py_CLEAR(target->start_event_obj);
@ -3462,69 +3462,65 @@ xmlparser_setevents(XMLParserObject *self, PyObject* args)
Py_CLEAR(target->start_ns_event_obj);
Py_CLEAR(target->end_ns_event_obj);
if (event_set == Py_None) {
if (events_to_report == Py_None) {
/* default is "end" only */
target->end_event_obj = PyUnicode_FromString("end");
Py_RETURN_NONE;
}
if (!PyTuple_Check(event_set)) /* FIXME: handle arbitrary sequences */
goto error;
if (!(events_seq = PySequence_Fast(events_to_report,
"events must be a sequence"))) {
return NULL;
}
for (i = 0; i < PyTuple_GET_SIZE(event_set); i++) {
PyObject* item = PyTuple_GET_ITEM(event_set, i);
char* event;
if (PyUnicode_Check(item)) {
event = _PyUnicode_AsString(item);
if (event == NULL)
goto error;
} else if (PyBytes_Check(item))
event = PyBytes_AS_STRING(item);
else {
goto error;
seqlen = PySequence_Size(events_seq);
for (i = 0; i < seqlen; ++i) {
PyObject *event_name_obj = PySequence_Fast_GET_ITEM(events_seq, i);
char *event_name = NULL;
if (PyUnicode_Check(event_name_obj)) {
event_name = _PyUnicode_AsString(event_name_obj);
} else if (PyBytes_Check(event_name_obj)) {
event_name = PyBytes_AS_STRING(event_name_obj);
}
if (strcmp(event, "start") == 0) {
Py_INCREF(item);
target->start_event_obj = item;
} else if (strcmp(event, "end") == 0) {
Py_INCREF(item);
if (event_name == NULL) {
Py_DECREF(events_seq);
PyErr_Format(PyExc_ValueError, "invalid events sequence");
return NULL;
} else if (strcmp(event_name, "start") == 0) {
Py_INCREF(event_name_obj);
target->start_event_obj = event_name_obj;
} else if (strcmp(event_name, "end") == 0) {
Py_INCREF(event_name_obj);
Py_XDECREF(target->end_event_obj);
target->end_event_obj = item;
} else if (strcmp(event, "start-ns") == 0) {
Py_INCREF(item);
target->end_event_obj = event_name_obj;
} else if (strcmp(event_name, "start-ns") == 0) {
Py_INCREF(event_name_obj);
Py_XDECREF(target->start_ns_event_obj);
target->start_ns_event_obj = item;
target->start_ns_event_obj = event_name_obj;
EXPAT(SetNamespaceDeclHandler)(
self->parser,
(XML_StartNamespaceDeclHandler) expat_start_ns_handler,
(XML_EndNamespaceDeclHandler) expat_end_ns_handler
);
} else if (strcmp(event, "end-ns") == 0) {
Py_INCREF(item);
} else if (strcmp(event_name, "end-ns") == 0) {
Py_INCREF(event_name_obj);
Py_XDECREF(target->end_ns_event_obj);
target->end_ns_event_obj = item;
target->end_ns_event_obj = event_name_obj;
EXPAT(SetNamespaceDeclHandler)(
self->parser,
(XML_StartNamespaceDeclHandler) expat_start_ns_handler,
(XML_EndNamespaceDeclHandler) expat_end_ns_handler
);
} else {
PyErr_Format(
PyExc_ValueError,
"unknown event '%s'", event
);
Py_DECREF(events_seq);
PyErr_Format(PyExc_ValueError, "unknown event '%s'", event_name);
return NULL;
}
}
Py_DECREF(events_seq);
Py_RETURN_NONE;
error:
PyErr_SetString(
PyExc_TypeError,
"invalid event tuple"
);
return NULL;
}
static PyMethodDef xmlparser_methods[] = {