[Python-checkins] r67687 - in python/branches/release25-maint: Lib/test/test_file.py Misc/NEWS Python/ceval.c

[jeffrey.yasskin]

Author: jeffrey.yasskin
Date: Wed Dec 10 18:23:20 2008
New Revision: 67687

Log:
Backport issue 4597 to python 2.5.3: Fixed several opcodes that weren't always
propagating exceptions.


Modified:
   python/branches/release25-maint/Lib/test/test_file.py
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Python/ceval.c

Modified: python/branches/release25-maint/Lib/test/test_file.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_file.py	(original)
+++ python/branches/release25-maint/Lib/test/test_file.py	Wed Dec 10 18:23:20 2008
@@ -341,6 +341,20 @@
         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.

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Wed Dec 10 18:23:20 2008
@@ -12,6 +12,9 @@
 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.
 

Modified: python/branches/release25-maint/Python/ceval.c
==============================================================================
--- python/branches/release25-maint/Python/ceval.c	(original)
+++ python/branches/release25-maint/Python/ceval.c	Wed Dec 10 18:23:20 2008
@@ -1025,6 +1025,7 @@
 			}
 			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 @@
 		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 @@
 				PyErr_Format(PyExc_SystemError,
 					     "no locals when loading %s",
 					     PyObject_REPR(w));
+				why = WHY_EXCEPTION;
 				break;
 			}
 			if (PyDict_CheckExact(v)) {
@@ -2381,7 +2385,10 @@
 			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 @@
 					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);