mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-11 19:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

print_error_text() doesn't encode the filename anymore

Browse source 
Use aslo PyUnicode_FromFormat() to format the line so only one call to
PyFile_WriteObject() is needed. tb_displayline() of Python/traceback.c has
similar implementation.
This commit is contained in:
Victor Stinner 2013-11-07 12:37:56 +01:00
parent 0b69fbc642
commit efa7a0e155
1 changed files with 35 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Python/pythonrun.c
View file

@ -50,6 +50,7 @@ _Py_IDENTIFIER(ps2);
_Py_IDENTIFIER(last_type); _Py_IDENTIFIER(last_type);
_Py_IDENTIFIER(last_value); _Py_IDENTIFIER(last_value);
_Py_IDENTIFIER(last_traceback); _Py_IDENTIFIER(last_traceback);
_Py_static_string(PyId_string, "<string>");
#ifdef Py_REF_DEBUG #ifdef Py_REF_DEBUG
static static
@ -1625,8 +1626,8 @@ PyRun_SimpleStringFlags(const char *command, PyCompilerFlags *flags)
} }
static int static int
parse_syntax_error(PyObject *err, PyObject **message, const char **filename, parse_syntax_error(PyObject *err, PyObject **message, PyObject **filename,
int *lineno, int *offset, const char **text) int *lineno, int *offset, PyObject **text)
{ {
long hold; long hold;
PyObject *v; PyObject *v;
@ -1637,6 +1638,7 @@ parse_syntax_error(PyObject *err, PyObject **message, const char **filename,
_Py_IDENTIFIER(text); _Py_IDENTIFIER(text);
*message = NULL; *message = NULL;
*filename = NULL;
/* new style errors. `err' is an instance */ /* new style errors. `err' is an instance */
*message = _PyObject_GetAttrId(err, &PyId_msg); *message = _PyObject_GetAttrId(err, &PyId_msg);
@ -1648,13 +1650,13 @@ parse_syntax_error(PyObject *err, PyObject **message, const char **filename,
goto finally; goto finally;
if (v == Py_None) { if (v == Py_None) {
Py_DECREF(v); Py_DECREF(v);
*filename = NULL; *filename = _PyUnicode_FromId(&PyId_string);
if (*filename == NULL)
goto finally;
Py_INCREF(*filename);
} }
else { else {
*filename = _PyUnicode_AsString(v); *filename = v;
Py_DECREF(v);
if (!*filename)
goto finally;
} }
v = _PyObject_GetAttrId(err, &PyId_lineno); v = _PyObject_GetAttrId(err, &PyId_lineno);
@ -1688,15 +1690,13 @@ parse_syntax_error(PyObject *err, PyObject **message, const char **filename,
*text = NULL; *text = NULL;
} }
else { else {
*text = _PyUnicode_AsString(v); *text = v;
Py_DECREF(v);
if (!*text)
goto finally;
} }
return 1; return 1;
finally: finally:
Py_XDECREF(*message); Py_XDECREF(*message);
Py_XDECREF(*filename);
return 0; return 0;
} }
@ -1707,9 +1707,15 @@ PyErr_Print(void)
} }
static void static void
print_error_text(PyObject *f, int offset, const char *text) print_error_text(PyObject *f, int offset, PyObject *text_obj)
{ {
char *text;
char *nl; char *nl;
text = _PyUnicode_AsString(text_obj);
if (text == NULL)
return;
if (offset >= 0) { if (offset >= 0) {
if (offset > 0 && offset == strlen(text) && text[offset - 1] == '\n') if (offset > 0 && offset == strlen(text) && text[offset - 1] == '\n')
offset--; offset--;
@ -1880,27 +1886,30 @@ print_exception(PyObject *f, PyObject *value)
if (err == 0 && if (err == 0 &&
_PyObject_HasAttrId(value, &PyId_print_file_and_line)) _PyObject_HasAttrId(value, &PyId_print_file_and_line))
{ {
PyObject *message; PyObject *message, *filename, *text;
const char *filename, *text;
int lineno, offset; int lineno, offset;
if (!parse_syntax_error(value, &message, &filename, if (!parse_syntax_error(value, &message, &filename,
&lineno, &offset, &text)) &lineno, &offset, &text))
PyErr_Clear(); PyErr_Clear();
else { else {
char buf[10]; PyObject *line;
PyFile_WriteString(" File \"", f);
if (filename == NULL)
PyFile_WriteString("<string>", f);
else
PyFile_WriteString(filename, f);
PyFile_WriteString("\", line ", f);
PyOS_snprintf(buf, sizeof(buf), "%d", lineno);
PyFile_WriteString(buf, f);
PyFile_WriteString("\n", f);
if (text != NULL)
print_error_text(f, offset, text);
Py_DECREF(value); Py_DECREF(value);
value = message; value = message;
line = PyUnicode_FromFormat(" File \"%U\", line %d\n",
filename, lineno);
Py_DECREF(filename);
if (line != NULL) {
PyFile_WriteObject(line, f, Py_PRINT_RAW);
Py_DECREF(line);
}
if (text != NULL) {
print_error_text(f, offset, text);
Py_DECREF(text);
}
/* Can't be bothered to check all those /* Can't be bothered to check all those
PyFile_WriteString() calls */ PyFile_WriteString() calls */
if (PyErr_Occurred()) if (PyErr_Occurred())
@ -2061,7 +2070,6 @@ PyRun_StringFlags(const char *str, int start, PyObject *globals,
PyObject *ret = NULL; PyObject *ret = NULL;
mod_ty mod; mod_ty mod;
PyArena *arena; PyArena *arena;
_Py_static_string(PyId_string, "<string>");
PyObject *filename; PyObject *filename;
filename = _PyUnicode_FromId(&PyId_string); /* borrowed */ filename = _PyUnicode_FromId(&PyId_string); /* borrowed */