Mercurial > cpython-lru_cache-weakref

diff Python/pythonrun.c @ 40799:04f5cbc74424

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Kill off softspace completely (except in formatter.py which seems to have a different feature with the same name). The change to test_doctest.txt reduces the doctest failures to 3.
author Guido van Rossum <guido@python.org>
date Fri, 09 Feb 2007 23:20:19 +0000
parents 6ebad2a6b990
children e759fd8d95ae
line wrap: on
line diff
--- a/Python/pythonrun.c	Fri Feb 09 22:43:47 2007 +0000
+++ b/Python/pythonrun.c	Fri Feb 09 23:20:19 2007 +0000
@@ -795,8 +795,6 @@
 		return -1;
 	}
 	Py_DECREF(v);
-	if (Py_FlushLine())
-		PyErr_Clear();
 	return 0;
 }
 
@@ -883,8 +881,6 @@
 		return -1;
 	}
 	Py_DECREF(v);
-	if (Py_FlushLine())
-		PyErr_Clear();
 	return 0;
 }
 
@@ -902,8 +898,6 @@
 		return -1;
 	}
 	Py_DECREF(v);
-	if (Py_FlushLine())
-		PyErr_Clear();
 	return 0;
 }
 
@@ -1018,8 +1012,6 @@
 	int exitcode = 0;
 
 	PyErr_Fetch(&exception, &value, &tb);
-	if (Py_FlushLine())
-		PyErr_Clear();
 	fflush(stdout);
 	if (value == NULL || value == Py_None)
 		goto done;
@@ -1097,8 +1089,6 @@
 				v2 = Py_None;
 				Py_INCREF(v2);
 			}
-			if (Py_FlushLine())
-				PyErr_Clear();
 			fflush(stdout);
 			PySys_WriteStderr("Error in sys.excepthook:\n");
 			PyErr_Display(exception2, v2, tb2);
@@ -1128,8 +1118,6 @@
 	if (f == NULL)
 		fprintf(stderr, "lost sys.stderr\n");
 	else {
-		if (Py_FlushLine())
-			PyErr_Clear();
 		fflush(stdout);
 		if (tb && tb != Py_None)
 			err = PyTraceBack_Print(tb, f);
@@ -1597,8 +1585,6 @@
 		Py_DECREF(exitfunc);
 	}
 
-	if (Py_FlushLine())
-		PyErr_Clear();
 }
 
 static void
@@ -1855,4 +1841,3 @@
 #ifdef __cplusplus
 }
 #endif
-