mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-13 18:33:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Last-minute fix for Jim H: don't die after del sys.stdout

Browse source
This commit is contained in:
Guido van Rossum 1997-12-31 05:53:15 +00:00
parent d11ec25ce4
commit 8f18320270
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Python/ceval.c
View file

@ -1017,8 +1017,12 @@ eval_code2(co, globals, locals,
err = Py_FlushLine(); err = Py_FlushLine();
if (err == 0) { if (err == 0) {
x = PySys_GetObject("stdout"); x = PySys_GetObject("stdout");
if (x == NULL) if (x == NULL) {
PyErr_SetString(
PyExc_RuntimeError,
"lost sys.stdout");
err = -1; err = -1;
}
} }
if (err == 0) if (err == 0)
err = PyFile_WriteObject(v, x, 0); err = PyFile_WriteObject(v, x, 0);
@ -1037,7 +1041,12 @@ eval_code2(co, globals, locals,
case PRINT_ITEM: case PRINT_ITEM:
v = POP(); v = POP();
w = PySys_GetObject("stdout"); w = PySys_GetObject("stdout");
if (PyFile_SoftSpace(w, 1)) if (w == NULL) {
PyErr_SetString(PyExc_RuntimeError,
"lost sys.stdout");
err = -1;
}
else if (PyFile_SoftSpace(w, 1))
err = PyFile_WriteString(" ", w); err = PyFile_WriteString(" ", w);
if (err == 0) if (err == 0)
err = PyFile_WriteObject(v, w, Py_PRINT_RAW); err = PyFile_WriteObject(v, w, Py_PRINT_RAW);