diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 01:03:14 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 01:03:14 (GMT) |
| commit | ebb5a88fd6d42fdcbddeaa74c976bffc7fbc0e32 (patch) | |
| tree | bba995077fcdb2e835f47c3963b2d1cc817fdcae /Python/pythonrun.c | |
| parent | d4cd18847d66459ac0f0942b1edbcadb0b9320a5 (diff) | |
| download | cpython-ebb5a88fd6d42fdcbddeaa74c976bffc7fbc0e32.zip cpython-ebb5a88fd6d42fdcbddeaa74c976bffc7fbc0e32.tar.gz cpython-ebb5a88fd6d42fdcbddeaa74c976bffc7fbc0e32.tar.bz2 | |
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.
........
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 1121e64..031d66f 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -334,7 +334,7 @@ flush_std_files(void) 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(); |