Skip to content

Commit 4645ecb

Browse files
authored
Merge pull request #8447 from jku/use-valid-signals-on-py38
test server: Don't mask invalid signals on py38
2 parents 09f9b00 + 23ec070 commit 4645ecb

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

news/a44cd47c-e34b-4679-b80e-9c543d4c63a6.trivial

Whitespace-only changes.

tests/lib/server.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,14 @@ class MockServer(BaseWSGIServer):
4242
def blocked_signals():
4343
"""Block all signals for e.g. starting a worker thread.
4444
"""
45-
old_mask = signal.pthread_sigmask(
46-
signal.SIG_SETMASK, range(1, signal.NSIG)
47-
)
45+
# valid_signals() was added in Python 3.8 (and not using it results
46+
# in a warning on pthread_sigmask() call)
47+
try:
48+
mask = signal.valid_signals()
49+
except AttributeError:
50+
mask = set(range(1, signal.NSIG))
51+
52+
old_mask = signal.pthread_sigmask(signal.SIG_SETMASK, mask)
4853
try:
4954
yield
5055
finally:

0 commit comments

Comments
 (0)