diff options
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Python/errors.c b/Python/errors.c index b67448090f..90dc729fd1 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -20,6 +20,9 @@ extern char *strerror(int); extern "C" { #endif +_Py_IDENTIFIER(builtins); +_Py_IDENTIFIER(stderr); + void PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback) @@ -844,7 +847,7 @@ PyErr_WriteUnraisable(PyObject *obj) PyErr_Fetch(&t, &v, &tb); - f = PySys_GetObject("stderr"); + f = _PySys_GetObjectId(&PyId_stderr); if (f == NULL || f == Py_None) goto done; @@ -878,7 +881,7 @@ PyErr_WriteUnraisable(PyObject *obj) goto done; } else { - if (PyUnicode_CompareWithASCIIString(moduleName, "builtins") != 0) { + if (_PyUnicode_CompareWithId(moduleName, &PyId_builtins) != 0) { if (PyFile_WriteObject(moduleName, f, Py_PRINT_RAW) < 0) goto done; if (PyFile_WriteString(".", f) < 0) @@ -1014,7 +1017,7 @@ PyErr_SyntaxLocationEx(const char *filename, int lineno, int col_offset) XXX The functionality of this function is quite similar to the functionality in tb_displayline() in traceback.c. */ -PyObject * +static PyObject * err_programtext(FILE *fp, int lineno) { int i; |