Mercurial > cpython-lru_cache-weakref
diff Python/pythonrun.c @ 61567:9f62f5865b44 3.1
Merged revisions 81156 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r81156 | victor.stinner | 2010-05-14 02:59:09 +0200 (ven., 14 mai 2010) | 5 lines
Issue #4653: fix typo in flush_std_files()
Don't call sys.stderr.flush() if sys has no stderr attribute or if
sys.stderr==None.
........
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Fri, 14 May 2010 01:03:14 +0000 |
| parents | f197407bdba2 |
| children | ca81646dd29c |
line wrap: on
line diff
--- a/Python/pythonrun.c Thu May 13 03:43:13 2010 +0000 +++ b/Python/pythonrun.c Fri May 14 01:03:14 2010 +0000 @@ -334,7 +334,7 @@ Py_DECREF(tmp); } - if (ferr != NULL || ferr != Py_None) { + if (ferr != NULL && ferr != Py_None) { tmp = PyObject_CallMethod(ferr, "flush", ""); if (tmp == NULL) PyErr_Clear();