[Python-checkins] bpo-31629: Add support.SaveSignals (#4183)
Victor Stinner
webhook-mailer at python.org
Tue Oct 31 06:14:08 EDT 2017
https://github.com/python/cpython/commit/19f68301a1295a9c30d9f28b8f1479cdcccd75aa
commit: 19f68301a1295a9c30d9f28b8f1479cdcccd75aa
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-31T03:14:01-07:00
summary:
bpo-31629: Add support.SaveSignals (#4183)
test_curses now saves/restores signals. On FreeBSD, the curses module
sets handlers of some signals, but don't restore old handlers when
the module is deinitialized.
files:
M Lib/test/support/__init__.py
M Lib/test/test_curses.py
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 4f60507919f..adc4e864924 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2755,3 +2755,42 @@ def fd_count():
msvcrt.CrtSetReportMode(report_type, old_modes[report_type])
return count
+
+
+class SaveSignals:
+ """
+ Save an restore signal handlers.
+
+ This class is only able to save/restore signal handlers registered
+ by the Python signal module: see bpo-13285 for "external" signal
+ handlers.
+ """
+
+ def __init__(self):
+ import signal
+ self.signal = signal
+ self.signals = list(range(1, signal.NSIG))
+ # SIGKILL and SIGSTOP signals cannot be ignored nor catched
+ for signame in ('SIGKILL', 'SIGSTOP'):
+ try:
+ signum = getattr(signal, signame)
+ except AttributeError:
+ continue
+ self.signals.remove(signum)
+ self.handlers = {}
+
+ def save(self):
+ for signum in self.signals:
+ handler = self.signal.getsignal(signum)
+ if handler is None:
+ # getsignal() returns None if a signal handler was not
+ # registered by the Python signal module,
+ # and the handler is not SIG_DFL nor SIG_IGN.
+ #
+ # Ignore the signal: we cannot restore the handler.
+ continue
+ self.handlers[signum] = handler
+
+ def restore(self):
+ for signum, handler in self.handlers.items():
+ self.signal.signal(signum, handler)
diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index 0d0b160d764..b0a28908da7 100644
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -15,7 +15,7 @@
import tempfile
import unittest
-from test.support import requires, import_module, verbose
+from test.support import requires, import_module, verbose, SaveSignals
# Optionally test curses module. This currently requires that the
# 'curses' resource be given on the regrtest command line using the -u
@@ -63,6 +63,8 @@ def tearDownClass(cls):
del cls.tmp
def setUp(self):
+ self.save_signals = SaveSignals()
+ self.save_signals.save()
if verbose:
# just to make the test output a little more readable
print()
@@ -72,6 +74,7 @@ def setUp(self):
def tearDown(self):
curses.resetty()
curses.endwin()
+ self.save_signals.restore()
def test_window_funcs(self):
"Test the methods of windows"
More information about the Python-checkins
mailing list