Mercurial > cpython-lru_cache-weakref
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 61546:90a9a34e5eb5 | 61567:9f62f5865b44 |
|---|---|
| 332 PyErr_Clear(); | 332 PyErr_Clear(); |
| 333 else | 333 else |
| 334 Py_DECREF(tmp); | 334 Py_DECREF(tmp); |
| 335 } | 335 } |
| 336 | 336 |
| 337 if (ferr != NULL || ferr != Py_None) { | 337 if (ferr != NULL && ferr != Py_None) { |
| 338 tmp = PyObject_CallMethod(ferr, "flush", ""); | 338 tmp = PyObject_CallMethod(ferr, "flush", ""); |
| 339 if (tmp == NULL) | 339 if (tmp == NULL) |
| 340 PyErr_Clear(); | 340 PyErr_Clear(); |
| 341 else | 341 else |
| 342 Py_DECREF(tmp); | 342 Py_DECREF(tmp); |