diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-11-07 23:07:29 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-11-07 23:07:29 +0100 |
| commit | 359ed22ea49d63923b451351ebf80decaaa7b79e (patch) | |
| tree | 315b259308cae6069a685d9926be04cd9c074ad8 /Python/errors.c | |
| parent | 0256aab9761d4459c9ceb8fdb11e4fe86f2bdb69 (diff) | |
| download | cpython-359ed22ea49d63923b451351ebf80decaaa7b79e.tar.gz | |
Issue #19512, #19515: remove shared identifiers, move identifiers where they
are used.
Move also _Py_IDENTIFIER() defintions to the top in modified files to remove
identifiers duplicated in the same file.
Diffstat (limited to 'Python/errors.c')
| -rw-r--r-- | Python/errors.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Python/errors.c b/Python/errors.c index 93e4724680..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_GetObjectId(&_PyId_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_CompareWithId(moduleName, &_PyId_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) |