diff Python/pythonrun.c @ 32526:78bd25b42d46 legacy-trunk

This closes patch: [ 960406 ] unblock signals in threads although the changes do not correspond exactly to any patch attached to that report. Non-main threads no longer have all signals masked. A different interface to readline is used. The handling of signals inside calls to PyOS_Readline is now rather different. These changes are all a bit scary! Review and cross-platform testing much appreciated.
author Michael W. Hudson <mwh@python.net>
date Wed, 07 Jul 2004 17:44:12 +0000
parents 846b3ee7e106
children caaef302f1e3
line wrap: on
line diff
--- a/Python/pythonrun.c	Wed Jul 07 15:59:49 2004 +0000
+++ b/Python/pythonrun.c	Wed Jul 07 17:44:12 2004 +0000
@@ -1435,7 +1435,8 @@
 		msg = "EOL while scanning single-quoted string";
 		break;
 	case E_INTR:
-		PyErr_SetNone(PyExc_KeyboardInterrupt);
+		if (!PyErr_Occurred())
+			PyErr_SetNone(PyExc_KeyboardInterrupt);
 		Py_XDECREF(v);
 		return;
 	case E_NOMEM: