From 30ea2f223f5c0a85a13bd893063555a9f587cd6d Mon Sep 17 00:00:00 2001 From: "Michael W. Hudson" Date: Wed, 7 Jul 2004 17:44:12 +0000 Subject: 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. --- Python/pythonrun.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Python/pythonrun.c') diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 113ff2d61a..d89e5e9913 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1435,7 +1435,8 @@ err_input(perrdetail *err) 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: -- cgit v1.2.1