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/bltinmodule.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Python/bltinmodule.c') diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 3604601f64..10e59c9580 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -1589,7 +1589,8 @@ builtin_raw_input(PyObject *self, PyObject *args) prompt); Py_XDECREF(po); if (s == NULL) { - PyErr_SetNone(PyExc_KeyboardInterrupt); + if (!PyErr_Occurred()) + PyErr_SetNone(PyExc_KeyboardInterrupt); return NULL; } if (*s == '\0') { -- cgit v1.2.1