Mercurial > cpython-lru_cache-weakref

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 682f74088602
children d1777f51923b
line wrap: on
line diff
--- a/Python/bltinmodule.c	Wed Jul 07 15:59:49 2004 +0000
+++ b/Python/bltinmodule.c	Wed Jul 07 17:44:12 2004 +0000
@@ -1589,7 +1589,8 @@
                                   prompt);
 		Py_XDECREF(po);
 		if (s == NULL) {
-			PyErr_SetNone(PyExc_KeyboardInterrupt);
+			if (!PyErr_Occurred())
+				PyErr_SetNone(PyExc_KeyboardInterrupt);
 			return NULL;
 		}
 		if (*s == '\0') {