diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-11-12 20:39:02 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-11-12 20:39:02 (GMT) |
| commit | 3f36a5736b92457273d06cc17d55dd379381873d (patch) | |
| tree | 81b290f15766d544f0962fed401f52036bf961cc /Python/pythonrun.c | |
| parent | dcf17f8a553f51fc77d6bb72f4563f625af0d639 (diff) | |
| download | cpython-3f36a5736b92457273d06cc17d55dd379381873d.zip cpython-3f36a5736b92457273d06cc17d55dd379381873d.tar.gz cpython-3f36a5736b92457273d06cc17d55dd379381873d.tar.bz2 | |
Issue #19515: Remove identifiers duplicated in the same file.
Patch written by Andrei Dorian Duma.
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8a59169..8ccf70d 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -37,9 +37,11 @@ _Py_IDENTIFIER(builtins); _Py_IDENTIFIER(excepthook); +_Py_IDENTIFIER(flush); _Py_IDENTIFIER(last_traceback); _Py_IDENTIFIER(last_type); _Py_IDENTIFIER(last_value); +_Py_IDENTIFIER(name); _Py_IDENTIFIER(ps1); _Py_IDENTIFIER(ps2); _Py_IDENTIFIER(stdin); @@ -215,7 +217,6 @@ get_codec_name(const char *encoding) { char *name_utf8, *name_str; PyObject *codec, *name = NULL; - _Py_IDENTIFIER(name); codec = _PyCodec_Lookup(encoding); if (!codec) @@ -512,7 +513,6 @@ flush_std_files(void) PyObject *fout = _PySys_GetObjectId(&PyId_stdout); PyObject *ferr = _PySys_GetObjectId(&PyId_stderr); PyObject *tmp; - _Py_IDENTIFIER(flush); if (fout != NULL && fout != Py_None && !file_is_closed(fout)) { tmp = _PyObject_CallMethodId(fout, &PyId_flush, ""); @@ -1009,7 +1009,6 @@ create_stdio(PyObject* io, _Py_IDENTIFIER(open); _Py_IDENTIFIER(isatty); _Py_IDENTIFIER(TextIOWrapper); - _Py_IDENTIFIER(name); _Py_IDENTIFIER(mode); /* stdin is always opened in buffered mode, first because it shouldn't @@ -2130,7 +2129,6 @@ flush_io(void) { PyObject *f, *r; PyObject *type, *value, *traceback; - _Py_IDENTIFIER(flush); /* Save the current exception */ PyErr_Fetch(&type, &value, &traceback); |