Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

SyntaxError__init__(): Be a little more robust when picking apart the 

location information for the SyntaxError -- do not do more than we
    need to, stopping as soon as an exception has been raised.
This commit is contained in:
Fred Drake 2001-02-28 21:52:10 +00:00
parent 9c98a428ef
commit 9da7f3b4f4
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Python/exceptions.c
View File

@ -702,29 +702,35 @@ SyntaxError__init__(PyObject *self, PyObject *args)
}
if (lenargs == 2) {
PyObject *info = PySequence_GetItem(args, 1);
PyObject *filename, *lineno, *offset, *text;
PyObject *filename = NULL, *lineno = NULL;
PyObject *offset = NULL, *text = NULL;
int status = 1;
if (!info)
goto finally;
filename = PySequence_GetItem(info, 0);
if (filename != NULL) {
lineno = PySequence_GetItem(info, 1);
if (lineno != NULL) {
offset = PySequence_GetItem(info, 2);
if (offset != NULL) {
text = PySequence_GetItem(info, 3);
Py_DECREF(info);
if (filename && lineno && offset && text) {
status = PyObject_SetAttrString(self, "filename", filename) ||
PyObject_SetAttrString(self, "lineno", lineno) ||
PyObject_SetAttrString(self, "offset", offset) ||
PyObject_SetAttrString(self, "text", text);
if (text != NULL) {
status =
PyObject_SetAttrString(self, "filename", filename)
|| PyObject_SetAttrString(self, "lineno", lineno)
|| PyObject_SetAttrString(self, "offset", offset)
|| PyObject_SetAttrString(self, "text", text);
Py_DECREF(text);
}
Py_XDECREF(filename);
Py_XDECREF(lineno);
Py_XDECREF(offset);
Py_XDECREF(text);
Py_DECREF(offset);
}
Py_DECREF(lineno);
}
Py_DECREF(filename);
}
Py_DECREF(info);
if (status)
goto finally;