Commit 8f183202 authored by Guido van Rossum's avatar Guido van Rossum

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

parent d11ec25c
......@@ -1017,9 +1017,13 @@ eval_code2(co, globals, locals,
err = Py_FlushLine();
if (err == 0) {
x = PySys_GetObject("stdout");
if (x == NULL)
if (x == NULL) {
PyErr_SetString(
PyExc_RuntimeError,
"lost sys.stdout");
err = -1;
}
}
if (err == 0)
err = PyFile_WriteObject(v, x, 0);
if (err == 0) {
......@@ -1037,7 +1041,12 @@ eval_code2(co, globals, locals,
case PRINT_ITEM:
v = POP();
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);
if (err == 0)
err = PyFile_WriteObject(v, w, Py_PRINT_RAW);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment