[Python-3000-checkins] r62276 - in python/branches/py3k: Misc/NEWS Python/pythonrun.c
amaury.forgeotdarc
python-3000-checkins at python.org
Thu Apr 10 23:03:09 CEST 2008
Author: amaury.forgeotdarc
Date: Thu Apr 10 23:03:09 2008
New Revision: 62276
Modified:
python/branches/py3k/Misc/NEWS
python/branches/py3k/Python/pythonrun.c
Log:
Add a NEWS entry for issue2221.
Also don't flush stdout on each call to exec() or eval().
Only interactive input really needs it.
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Thu Apr 10 23:03:09 2008
@@ -12,6 +12,10 @@
Core and Builtins
-----------------
+- Issue #2221: Corrected a SystemError "error return without exception set",
+ when the code executed by exec() raises an exception, and sys.stdout.flush()
+ also raises an error.
+
- Bug #2565: The repr() of type objects now calls them 'class',
not 'type' - whether they are builtin types or not.
Modified: python/branches/py3k/Python/pythonrun.c
==============================================================================
--- python/branches/py3k/Python/pythonrun.c (original)
+++ python/branches/py3k/Python/pythonrun.c Thu Apr 10 23:03:09 2008
@@ -54,6 +54,7 @@
static void initmain(void);
static void initsite(void);
static int initstdio(void);
+static void flush_io(void);
static PyObject *run_mod(mod_ty, const char *, PyObject *, PyObject *,
PyCompilerFlags *, PyArena *);
static PyObject *run_pyc_file(FILE *, const char *, PyObject *, PyObject *,
@@ -992,6 +993,7 @@
d = PyModule_GetDict(m);
v = run_mod(mod, filename, d, d, flags, arena);
PyArena_Free(arena);
+ flush_io();
if (v == NULL) {
PyErr_Print();
return -1;
@@ -1082,6 +1084,7 @@
v = PyRun_FileExFlags(fp, filename, Py_file_input, d, d,
closeit, flags);
}
+ flush_io();
if (v == NULL) {
PyErr_Print();
ret = -1;
@@ -1513,7 +1516,6 @@
return NULL;
v = PyEval_EvalCode(co, globals, locals);
Py_DECREF(co);
- flush_io();
return v;
}
@@ -1546,7 +1548,6 @@
if (v && flags)
flags->cf_flags |= (co->co_flags & PyCF_MASK);
Py_DECREF(co);
- flush_io();
return v;
}
More information about the Python-3000-checkins
mailing list