archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

update parse_syntax_error() from python3.3 - this is an internal python function that isn't exposed to the api.

Browse Source
This commit is contained in:
Campbell Barton
2012-12-04 20:09:07 +00:00
parent d0667c70dd
commit 5b9f30980a
1 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/blender/python/intern/bpy_traceback.c
View File

@@ -39,70 +39,80 @@ static const char *traceback_filepath(PyTracebackObject *tb, PyObject **coerce)
return PyBytes_AS_STRING((*coerce = PyUnicode_EncodeFSDefault(tb->tb_frame->f_code->co_filename)));
}
/* copied from pythonrun.c, 3.2.0 */
/* copied from pythonrun.c, 3.3.0 */
static int
parse_syntax_error(PyObject *err, PyObject **message, const char **filename,
int *lineno, int *offset, const char **text)
{
long hold;
PyObject *v;
_Py_IDENTIFIER(msg);
_Py_IDENTIFIER(filename);
_Py_IDENTIFIER(lineno);
_Py_IDENTIFIER(offset);
_Py_IDENTIFIER(text);
/* old style errors */
if (PyTuple_Check(err))
return PyArg_ParseTuple(err, "O(ziiz)", message, filename,
lineno, offset, text);
*message = NULL;
/* new style errors. `err' is an instance */
if (!(v = PyObject_GetAttrString(err, "msg")))
*message = _PyObject_GetAttrId(err, &PyId_msg);
if (!*message)
goto finally;
*message = v;
if (!(v = PyObject_GetAttrString(err, "filename")))
v = _PyObject_GetAttrId(err, &PyId_filename);
if (!v)
goto finally;
if (v == Py_None)
if (v == Py_None) {
Py_DECREF(v);
*filename = NULL;
else if (!(*filename = _PyUnicode_AsString(v)))
goto finally;
}
else {
*filename = _PyUnicode_AsString(v);
Py_DECREF(v);
if (!*filename)
goto finally;
}
Py_DECREF(v);
if (!(v = PyObject_GetAttrString(err, "lineno")))
v = _PyObject_GetAttrId(err, &PyId_lineno);
if (!v)
goto finally;
hold = PyLong_AsLong(v);
Py_DECREF(v);
v = NULL;
if (hold < 0 && PyErr_Occurred())
goto finally;
*lineno = (int)hold;
if (!(v = PyObject_GetAttrString(err, "offset")))
v = _PyObject_GetAttrId(err, &PyId_offset);
if (!v)
goto finally;
if (v == Py_None) {
*offset = -1;
Py_DECREF(v);
v = NULL;
}
else {
} else {
hold = PyLong_AsLong(v);
Py_DECREF(v);
v = NULL;
if (hold < 0 && PyErr_Occurred())
goto finally;
*offset = (int)hold;
}
if (!(v = PyObject_GetAttrString(err, "text")))
v = _PyObject_GetAttrId(err, &PyId_text);
if (!v)
goto finally;
if (v == Py_None)
if (v == Py_None) {
Py_DECREF(v);
*text = NULL;
else if (!PyUnicode_Check(v) ||
!(*text = _PyUnicode_AsString(v)))
goto finally;
Py_DECREF(v);
}
else {
*text = _PyUnicode_AsString(v);
Py_DECREF(v);
if (!*text)
goto finally;
}
return 1;
finally:
Py_XDECREF(v);
Py_XDECREF(*message);
return 0;
}
/* end copied function! */