diff options
| author | Jeffrey Yasskin <jyasskin@gmail.com> | 2008-12-10 17:23:20 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@gmail.com> | 2008-12-10 17:23:20 +0000 |
| commit | c3447f51c37ae9674afe34e4eb6142734dcb8698 (patch) | |
| tree | 122e5128de9e91d2cd20283fa6629206e41774e3 | |
| parent | ed3ddfe981ae23e7c8fddd1e613b1a47c9cb7022 (diff) | |
| download | cpython-c3447f51c37ae9674afe34e4eb6142734dcb8698.tar.gz | |
Backport issue 4597 to python 2.5.3: Fixed several opcodes that weren't always
propagating exceptions.
| -rw-r--r-- | Lib/test/test_file.py | 14 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/ceval.c | 17 |
3 files changed, 31 insertions, 3 deletions
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py index 0a8114a0c7..ba6ea47edf 100644 --- a/Lib/test/test_file.py +++ b/Lib/test/test_file.py @@ -341,6 +341,20 @@ class StdoutTests(unittest.TestCase): finally: sys.stdout = save_stdout + def test_del_stdout_before_print(self): + # Issue 4597: 'print' with no argument wasn't reporting when + # sys.stdout was deleted. + save_stdout = sys.stdout + del sys.stdout + try: + print + except RuntimeError, e: + self.assertEquals(str(e), "lost sys.stdout") + else: + self.fail("Expected RuntimeError") + finally: + sys.stdout = save_stdout + def test_main(): # Historically, these tests have been sloppy about removing TESTFN. @@ -12,6 +12,9 @@ What's New in Python 2.5.3? Core and builtins ----------------- +- Issue #4597: Fixed several opcodes that weren't always propagating + exceptions. + - Issue #4589: Propagated an exception thrown by a context manager's __exit__ method's result while it's being converted to bool. diff --git a/Python/ceval.c b/Python/ceval.c index d74149c4a9..5f8b860ab5 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1025,6 +1025,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) } Py_FatalError("invalid argument to DUP_TOPX" " (bytecode corruption?)"); + /* Never returns, so don't bother to set why. */ break; case UNARY_POSITIVE: @@ -1618,9 +1619,11 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) case PRINT_NEWLINE: if (stream == NULL || stream == Py_None) { w = PySys_GetObject("stdout"); - if (w == NULL) + if (w == NULL) { PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout"); + why = WHY_EXCEPTION; + } } if (w != NULL) { Py_INCREF(w); @@ -1837,6 +1840,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) PyErr_Format(PyExc_SystemError, "no locals when loading %s", PyObject_REPR(w)); + why = WHY_EXCEPTION; break; } if (PyDict_CheckExact(v)) { @@ -2381,7 +2385,10 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) Py_DECREF(v); if (x != NULL) { v = POP(); - err = PyFunction_SetClosure(x, v); + if (PyFunction_SetClosure(x, v) != 0) { + /* Can't happen unless bytecode is corrupt. */ + why = WHY_EXCEPTION; + } Py_DECREF(v); } if (x != NULL && oparg > 0) { @@ -2395,7 +2402,11 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) w = POP(); PyTuple_SET_ITEM(v, oparg, w); } - err = PyFunction_SetDefaults(x, v); + if (PyFunction_SetDefaults(x, v) != 0) { + /* Can't happen unless + PyFunction_SetDefaults changes. */ + why = WHY_EXCEPTION; + } Py_DECREF(v); } PUSH(x); |