traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xmlparseobject: Remove the unused conv_attrs field, added an 

in_callback field that's set to true whenever a callback into an
    event handler is true.  Needed for:

set_error():  Add line number of offset information to the exception
    as attributes, so users don't need to parse the text of the
    message.

set_error_attr():  New helper function for set_error().

xmlparse_GetInputContext():  New function of the parser object;
    returns the document source for an event during a callback, None
    at all other times.

xmlparse_SetParamEntityParsing():  Make the signature consistent with
    the other parser methods (use xmlparseobject* for self instead of
    PyObject*).

initpyexpat():  Don't lose the reference to the exception class!

call_with_frame(),
getcode():  Re-indent to be consistent with the rest of the file.
This commit is contained in:
Fred Drake 2001-02-14 18:29:45 +00:00
parent 8e6d44eedc
commit bd6101c3dc
1 changed files with 156 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

243
Modules/pyexpat.c
View File

@ -73,7 +73,7 @@ typedef struct {
if false, UTF-8 strings are returned */ if false, UTF-8 strings are returned */
int ordered_attributes; /* Return attributes as a list. */ int ordered_attributes; /* Return attributes as a list. */
int specified_attributes; /* Report only specified attributes. */ int specified_attributes; /* Report only specified attributes. */
PyObject *(*conv_attrs)(XML_Char **); int in_callback; /* Is a callback active? */
PyObject **handlers; PyObject **handlers;
} xmlparseobject; } xmlparseobject;
@ -91,24 +91,42 @@ struct HandlerInfo {
staticforward struct HandlerInfo handler_info[64]; staticforward struct HandlerInfo handler_info[64];
/* Set an integer attribute on the error object; return true on success,
* false on an exception.
*/
static int
set_error_attr(PyObject *err, char *name, int value)
{
PyObject *v = PyInt_FromLong(value);
if (v != NULL && PyObject_SetAttrString(err, name, v) == -1) {
Py_DECREF(v);
return 0;
}
return 1;
}
/* Build and set an Expat exception, including positioning
* information. Always returns NULL.
*/
static PyObject * static PyObject *
set_error(xmlparseobject *self) set_error(xmlparseobject *self)
{ {
PyObject *err; PyObject *err;
char buffer[256]; char buffer[256];
XML_Parser parser = self->itself; XML_Parser parser = self->itself;
int lineno = XML_GetErrorLineNumber(parser);
int column = XML_GetErrorColumnNumber(parser);
enum XML_Error code = XML_GetErrorCode(parser);
sprintf(buffer, "%.200s: line %i, column %i", sprintf(buffer, "%.200s: line %i, column %i",
XML_ErrorString(XML_GetErrorCode(parser)), XML_ErrorString(code), lineno, column);
XML_GetErrorLineNumber(parser),
XML_GetErrorColumnNumber(parser));
err = PyObject_CallFunction(ErrorObject, "s", buffer); err = PyObject_CallFunction(ErrorObject, "s", buffer);
if (err != NULL) { if ( err != NULL
PyObject *code = PyInt_FromLong(XML_GetErrorCode(parser)); && set_error_attr(err, "code", code)
&& set_error_attr(err, "offset", column)
if (code != NULL && PyObject_SetAttrString(err, "code", code) != -1) && set_error_attr(err, "lineno", lineno)) {
PyErr_SetObject(ErrorObject, err); PyErr_SetObject(ErrorObject, err);
} }
return NULL; return NULL;
} }
@ -276,79 +294,81 @@ flag_error(xmlparseobject *self)
static PyCodeObject* static PyCodeObject*
getcode(enum HandlerTypes slot, char* func_name, int lineno) getcode(enum HandlerTypes slot, char* func_name, int lineno)
{ {
PyObject *code = NULL; PyObject *code = NULL;
PyObject *name = NULL; PyObject *name = NULL;
PyObject *nulltuple = NULL; PyObject *nulltuple = NULL;
PyObject *filename = NULL; PyObject *filename = NULL;
if (handler_info[slot].tb_code == NULL) {
code = PyString_FromString(""); if (handler_info[slot].tb_code == NULL) {
if (code == NULL) code = PyString_FromString("");
goto failed; if (code == NULL)
name = PyString_FromString(func_name); goto failed;
if (name == NULL) name = PyString_FromString(func_name);
goto failed; if (name == NULL)
nulltuple = PyTuple_New(0); goto failed;
if (nulltuple == NULL) nulltuple = PyTuple_New(0);
goto failed; if (nulltuple == NULL)
filename = PyString_FromString(__FILE__); goto failed;
handler_info[slot].tb_code = PyCode_New( filename = PyString_FromString(__FILE__);
0, /* argcount */ handler_info[slot].tb_code =
0, /* nlocals */ PyCode_New(0, /* argcount */
0, /* stacksize */ 0, /* nlocals */
0, /* flags */ 0, /* stacksize */
code, /* code */ 0, /* flags */
nulltuple, /* consts */ code, /* code */
nulltuple, /* names */ nulltuple, /* consts */
nulltuple, /* varnames */ nulltuple, /* names */
nulltuple, /* varnames */
#if PYTHON_API_VERSION >= 1010 #if PYTHON_API_VERSION >= 1010
nulltuple, /* freevars */ nulltuple, /* freevars */
nulltuple, /* cellvars */ nulltuple, /* cellvars */
#endif #endif
filename, /* filename */ filename, /* filename */
name, /* name */ name, /* name */
lineno, /* firstlineno */ lineno, /* firstlineno */
code /* lnotab */ code /* lnotab */
); );
if (handler_info[slot].tb_code == NULL) if (handler_info[slot].tb_code == NULL)
goto failed; goto failed;
Py_DECREF(code); Py_DECREF(code);
Py_DECREF(nulltuple); Py_DECREF(nulltuple);
Py_DECREF(filename); Py_DECREF(filename);
Py_DECREF(name); Py_DECREF(name);
} }
return handler_info[slot].tb_code; return handler_info[slot].tb_code;
failed: failed:
Py_XDECREF(code); Py_XDECREF(code);
Py_XDECREF(name); Py_XDECREF(name);
return NULL; return NULL;
} }
static PyObject* static PyObject*
call_with_frame(PyCodeObject *c, PyObject* func, PyObject* args) call_with_frame(PyCodeObject *c, PyObject* func, PyObject* args)
{ {
PyThreadState *tstate = PyThreadState_GET(); PyThreadState *tstate = PyThreadState_GET();
PyFrameObject *f; PyFrameObject *f;
PyObject *res; PyObject *res;
if (c == NULL)
return NULL; if (c == NULL)
f = PyFrame_New( return NULL;
tstate, /*back*/ f = PyFrame_New(
c, /*code*/ tstate, /*back*/
tstate->frame->f_globals, /*globals*/ c, /*code*/
NULL /*locals*/ tstate->frame->f_globals, /*globals*/
NULL /*locals*/
#if PYTHON_API_VERSION >= 1010 #if PYTHON_API_VERSION >= 1010
,NULL /*closure*/ ,NULL /*closure*/
#endif #endif
); );
if (f == NULL) if (f == NULL)
return NULL; return NULL;
tstate->frame = f; tstate->frame = f;
res = PyEval_CallObject(func, args); res = PyEval_CallObject(func, args);
if (res == NULL && tstate->curexc_traceback == NULL) if (res == NULL && tstate->curexc_traceback == NULL)
PyTraceBack_Here(f); PyTraceBack_Here(f);
tstate->frame = f->f_back; tstate->frame = f->f_back;
Py_DECREF(f); Py_DECREF(f);
return res; return res;
} }
#if PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION < 6 #if PY_MAJOR_VERSION == 1 && PY_MINOR_VERSION < 6
@ -426,13 +446,15 @@ my_StartElementHandler(void *userData,
return; return;
} }
/* Container is now a borrowed reference; ignore it. */ /* Container is now a borrowed reference; ignore it. */
rv = call_with_frame(getcode(StartElement, "StartElement", __LINE__), self->in_callback = 1;
rv = call_with_frame(getcode(StartElement, "StartElement", __LINE__),
self->handlers[StartElement], args); self->handlers[StartElement], args);
Py_DECREF(args); self->in_callback = 0;
Py_DECREF(args);
if (rv == NULL) { if (rv == NULL) {
flag_error(self); flag_error(self);
return; return;
} }
Py_DECREF(rv); Py_DECREF(rv);
} }
} }
@ -451,8 +473,10 @@ my_##NAME##Handler PARAMS {\
args = Py_BuildValue PARAM_FORMAT ;\ args = Py_BuildValue PARAM_FORMAT ;\
if (!args) \ if (!args) \
return RETURN; \ return RETURN; \
self->in_callback = 1; \
rv = call_with_frame(getcode(NAME,#NAME,__LINE__), \ rv = call_with_frame(getcode(NAME,#NAME,__LINE__), \
self->handlers[NAME], args); \ self->handlers[NAME], args); \
self->in_callback = 0; \
Py_DECREF(args); \ Py_DECREF(args); \
if (rv == NULL) { \ if (rv == NULL) { \
flag_error(self); \ flag_error(self); \
@ -910,6 +934,40 @@ xmlparse_GetBase(xmlparseobject *self, PyObject *args)
return Py_BuildValue("z", XML_GetBase(self->itself)); return Py_BuildValue("z", XML_GetBase(self->itself));
} }
#if EXPAT_VERSION >= 0x015f00
static char xmlparse_GetInputContext__doc__[] =
"GetInputContext() -> string\n\
Return the untranslated text of the input that caused the current event.\n\
If the event was generated by a large amount of text (such as a start tag\n\
for an element with many attributes), not all of the text may be available.";
static PyObject *
xmlparse_GetInputContext(xmlparseobject *self, PyObject *args)
{
PyObject *result = NULL;
if (PyArg_ParseTuple(args, ":GetInputContext")) {
if (self->in_callback) {
int offset, size;
const char *buffer
= XML_GetInputContext(self->itself, &offset, &size);
if (buffer != NULL)
result = PyString_FromStringAndSize(buffer + offset, size);
else {
result = Py_None;
Py_INCREF(result);
}
}
else {
result = Py_None;
Py_INCREF(result);
}
}
return result;
}
#endif
static char xmlparse_ExternalEntityParserCreate__doc__[] = static char xmlparse_ExternalEntityParserCreate__doc__[] =
"ExternalEntityParserCreate(context[, encoding])\n\ "ExternalEntityParserCreate(context[, encoding])\n\
Create a parser for parsing an external entity based on the\n\ Create a parser for parsing an external entity based on the\n\
@ -940,7 +998,7 @@ xmlparse_ExternalEntityParserCreate(xmlparseobject *self, PyObject *args)
new_parser->returns_unicode = self->returns_unicode; new_parser->returns_unicode = self->returns_unicode;
new_parser->ordered_attributes = self->ordered_attributes; new_parser->ordered_attributes = self->ordered_attributes;
new_parser->specified_attributes = self->specified_attributes; new_parser->specified_attributes = self->specified_attributes;
new_parser->conv_attrs = self->conv_attrs; new_parser->in_callback = 0;
new_parser->itself = XML_ExternalEntityParserCreate(self->itself, context, new_parser->itself = XML_ExternalEntityParserCreate(self->itself, context,
encoding); encoding);
new_parser->handlers = 0; new_parser->handlers = 0;
@ -987,12 +1045,12 @@ XML_PARAM_ENTITY_PARSING_ALWAYS. Returns true if setting the flag\n\
was successful."; was successful.";
static PyObject* static PyObject*
xmlparse_SetParamEntityParsing(PyObject *p, PyObject* args) xmlparse_SetParamEntityParsing(xmlparseobject *p, PyObject* args)
{ {
int flag; int flag;
if (!PyArg_ParseTuple(args, "i", &flag)) if (!PyArg_ParseTuple(args, "i", &flag))
return NULL; return NULL;
flag = XML_SetParamEntityParsing(((xmlparseobject*)p)->itself, flag); flag = XML_SetParamEntityParsing(p->itself, flag);
return PyInt_FromLong(flag); return PyInt_FromLong(flag);
} }
@ -1000,18 +1058,22 @@ xmlparse_SetParamEntityParsing(PyObject *p, PyObject* args)
static struct PyMethodDef xmlparse_methods[] = { static struct PyMethodDef xmlparse_methods[] = {
{"Parse", (PyCFunction)xmlparse_Parse, {"Parse", (PyCFunction)xmlparse_Parse,
METH_VARARGS, xmlparse_Parse__doc__}, METH_VARARGS, xmlparse_Parse__doc__},
{"ParseFile", (PyCFunction)xmlparse_ParseFile, {"ParseFile", (PyCFunction)xmlparse_ParseFile,
METH_VARARGS, xmlparse_ParseFile__doc__}, METH_VARARGS, xmlparse_ParseFile__doc__},
{"SetBase", (PyCFunction)xmlparse_SetBase, {"SetBase", (PyCFunction)xmlparse_SetBase,
METH_VARARGS, xmlparse_SetBase__doc__}, METH_VARARGS, xmlparse_SetBase__doc__},
{"GetBase", (PyCFunction)xmlparse_GetBase, {"GetBase", (PyCFunction)xmlparse_GetBase,
METH_VARARGS, xmlparse_GetBase__doc__}, METH_VARARGS, xmlparse_GetBase__doc__},
{"ExternalEntityParserCreate", (PyCFunction)xmlparse_ExternalEntityParserCreate, {"ExternalEntityParserCreate", (PyCFunction)xmlparse_ExternalEntityParserCreate,
METH_VARARGS, xmlparse_ExternalEntityParserCreate__doc__}, METH_VARARGS, xmlparse_ExternalEntityParserCreate__doc__},
#if EXPAT_VERSION >= 0x010200 #if EXPAT_VERSION >= 0x010200
{"SetParamEntityParsing", xmlparse_SetParamEntityParsing, {"SetParamEntityParsing", (PyCFunction)xmlparse_SetParamEntityParsing,
METH_VARARGS, xmlparse_SetParamEntityParsing__doc__}, METH_VARARGS, xmlparse_SetParamEntityParsing__doc__},
#endif
#if EXPAT_VERSION >= 0x015f00
{"GetInputContext", (PyCFunction)xmlparse_GetInputContext,
METH_VARARGS, xmlparse_GetInputContext__doc__},
#endif #endif
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
@ -1096,6 +1158,7 @@ newxmlparseobject(char *encoding, char *namespace_separator)
#endif #endif
self->ordered_attributes = 0; self->ordered_attributes = 0;
self->specified_attributes = 0; self->specified_attributes = 0;
self->in_callback = 0;
self->handlers = NULL; self->handlers = NULL;
if (namespace_separator) { if (namespace_separator) {
self->itself = XML_ParserCreateNS(encoding, *namespace_separator); self->itself = XML_ParserCreateNS(encoding, *namespace_separator);
@ -1443,10 +1506,16 @@ initpyexpat(void)
pyexpat_module_documentation); pyexpat_module_documentation);
/* Add some symbolic constants to the module */ /* Add some symbolic constants to the module */
if (ErrorObject == NULL) if (ErrorObject == NULL) {
ErrorObject = PyErr_NewException("xml.parsers.expat.error", ErrorObject = PyErr_NewException("xml.parsers.expat.ExpatError",
NULL, NULL); NULL, NULL);
if (ErrorObject == NULL)
return;
}
Py_INCREF(ErrorObject);
PyModule_AddObject(m, "error", ErrorObject); PyModule_AddObject(m, "error", ErrorObject);
Py_INCREF(ErrorObject);
PyModule_AddObject(m, "ExpatError", ErrorObject);
Py_INCREF(&Xmlparsetype); Py_INCREF(&Xmlparsetype);
PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype); PyModule_AddObject(m, "XMLParserType", (PyObject *) &Xmlparsetype);