diff options
| -rw-r--r-- | Lib/test/test_signal.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/Lib/test/test_signal.py b/Lib/test/test_signal.py index 906b4a0..d35d7c4 100644 --- a/Lib/test/test_signal.py +++ b/Lib/test/test_signal.py @@ -212,13 +212,13 @@ class BasicSignalTests(unittest.TestCase): @unittest.skipUnless(sys.platform == "win32", "Windows specific") class WindowsSignalTests(unittest.TestCase): def test_issue9324(self): + # Updated for issue #10003, adding SIGBREAK handler = lambda x, y: None - signal.signal(signal.SIGABRT, handler) - signal.signal(signal.SIGFPE, handler) - signal.signal(signal.SIGILL, handler) - signal.signal(signal.SIGINT, handler) - signal.signal(signal.SIGSEGV, handler) - signal.signal(signal.SIGTERM, handler) + for sig in (signal.SIGABRT, signal.SIGBREAK, signal.SIGFPE, + signal.SIGILL, signal.SIGINT, signal.SIGSEGV, + signal.SIGTERM): + # Set and then reset a handler for signals that work on windows + signal.signal(sig, signal.signal(sig, handler)) with self.assertRaises(ValueError): signal.signal(-1, handler) @@ -299,6 +299,9 @@ Library Extension Modules ----------------- +- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression + introduced by issue #9324. + - Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file descriptor is provided. Patch by Pascal Chambon. diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 5aeee4c..b49e13c 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -261,6 +261,11 @@ signal_signal(PyObject *self, PyObject *args) /* Validate that sig_num is one of the allowable signals */ switch (sig_num) { case SIGABRT: break; +#ifdef SIGBREAK + /* Issue #10003: SIGBREAK is not documented as permitted, but works + and corresponds to CTRL_BREAK_EVENT. */ + case SIGBREAK: break; +#endif case SIGFPE: break; case SIGILL: break; case SIGINT: break; |