Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-41675: Modernize siginterrupt calls (GH-22028) 

siginterrupt is deprecated:

./Modules/signalmodule.c:667:5: warning: ‘siginterrupt’ is deprecated: Use sigaction with SA_RESTART instead [-Wdeprecated-declarations]
  667 |     if (siginterrupt(signalnum, flag)<0) {
This commit is contained in:
Pablo Galindo 2020-09-02 15:29:12 +01:00 committed by GitHub
parent 51fece1bb8
commit f9c5e3f5f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS.d/next/Core and Builtins/2020-08-31-14-53-17.bpo-41675.VSoqWU.rst Normal file
View File

@ -0,0 +1,3 @@
The implementation of :func:`signal.siginterrupt` now uses :c:func:`sigaction`
(if it is available in the system) instead of the deprecated :c:func:`siginterrupt`.
Patch by Pablo Galindo.

14
Modules/signalmodule.c
View File

@ -664,7 +664,19 @@ signal_siginterrupt_impl(PyObject *module, int signalnum, int flag)
"signal number out of range"); "signal number out of range");
return NULL; return NULL;
} }
if (siginterrupt(signalnum, flag)<0) { #ifdef HAVE_SIGACTION
struct sigaction act;
(void) sigaction(signalnum, NULL, &act);
if (flag) {
act.sa_flags &= ~SA_RESTART;
}
else {
act.sa_flags |= SA_RESTART;
}
if (sigaction(signalnum, &act, NULL) < 0) {
#else
if (siginterrupt(signalnum, flag) < 0) {
#endif
PyErr_SetFromErrno(PyExc_OSError); PyErr_SetFromErrno(PyExc_OSError);
return NULL; return NULL;
} }