diff options
| author | Michael W. Hudson <mwh@python.net> | 2004-07-07 17:44:12 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2004-07-07 17:44:12 (GMT) |
| commit | 30ea2f223f5c0a85a13bd893063555a9f587cd6d (patch) | |
| tree | d9ad0b824eb899d1163043d982dd7d961b11a263 /Python/bltinmodule.c | |
| parent | e3c330b42a5dbc64a254354e906885134a852949 (diff) | |
| download | cpython-30ea2f223f5c0a85a13bd893063555a9f587cd6d.zip cpython-30ea2f223f5c0a85a13bd893063555a9f587cd6d.tar.gz cpython-30ea2f223f5c0a85a13bd893063555a9f587cd6d.tar.bz2 | |
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.
Diffstat (limited to 'Python/bltinmodule.c')
| -rw-r--r-- | Python/bltinmodule.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 3604601..10e59c9 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') { |