diff options
| author | Jeffrey Yasskin <jyasskin@gmail.com> | 2008-12-11 05:21:18 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@gmail.com> | 2008-12-11 05:21:18 +0000 |
| commit | 6961498040580af25d30e3ec8358d2674bd31f12 (patch) | |
| tree | 2a9609e038eeb9f1ade447aef7a80974f861f2d1 | |
| parent | 79c9f76629009ad8f014873437431087832e47d1 (diff) | |
| download | cpython-git-6961498040580af25d30e3ec8358d2674bd31f12.tar.gz | |
Merged revisions 67666,67685 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67666 | jeffrey.yasskin | 2008-12-08 10:55:24 -0800 (Mon, 08 Dec 2008) | 3 lines
Issue 4597: Fix several cases in EvalFrameEx where an exception could be
"raised" without setting x, err, or why to let the eval loop know.
........
r67685 | jeffrey.yasskin | 2008-12-09 23:35:02 -0800 (Tue, 09 Dec 2008) | 2 lines
Update Misc/NEWS for r67666.
........
| -rw-r--r-- | Lib/test/test_file.py | 14 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Python/ceval.c | 17 |
3 files changed, 32 insertions, 4 deletions
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py index b93bdbd9d0..2d791a55c0 100644 --- a/Lib/test/test_file.py +++ b/Lib/test/test_file.py @@ -531,6 +531,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 as 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,7 +12,10 @@ What's New in Python 2.6.2 Core and Builtins ----------------- -- Issue #4597: Fixed exception handling when the __exit__ function of a +- Issue #4597: Fixed several opcodes that weren't always propagating + exceptions. + +- Issue #4589: Fixed exception handling when the __exit__ function of a context manager returns a value that cannot be converted to a bool. - Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` diff --git a/Python/ceval.c b/Python/ceval.c index dd1e171770..5bac65fd0d 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1041,6 +1041,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: @@ -1634,9 +1635,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) { /* w.write() may replace sys.stdout, so we @@ -1862,6 +1865,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)) { @@ -2458,7 +2462,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) { @@ -2472,7 +2479,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); |