mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #8407: signal.pthread_sigmask() returns a set instead of a list

Browse source 
Update the doc. Refactor also related tests.
This commit is contained in:
Victor Stinner 2011-05-04 13:20:35 +02:00
parent 6fd49e152a
commit 35b300c5fd
3 changed files with 59 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

65
Modules/signalmodule.c
View file

@ -552,11 +552,45 @@ error:
return result;
}
static PyObject*
sigset_to_set(sigset_t mask)
{
PyObject *signum, *result;
int sig;
result = PySet_New(0);
if (result == NULL)
return NULL;
for (sig = 1; sig < NSIG; sig++) {
if (sigismember(&mask, sig) != 1)
continue;
/* Handle the case where it is a member by adding the signal to
the result list. Ignore the other cases because they mean the
signal isn't a member of the mask or the signal was invalid,
and an invalid signal must have been our fault in constructing
the loop boundaries. */
signum = PyLong_FromLong(sig);
if (signum == NULL) {
Py_DECREF(result);
return NULL;
}
if (PySet_Add(result, signum) == -1) {
Py_DECREF(signum);
Py_DECREF(result);
return NULL;
}
Py_DECREF(signum);
}
return result;
}
static PyObject *
signal_pthread_sigmask(PyObject *self, PyObject *args)
{
int how, sig;
PyObject *signals, *result, *signum;
int how;
PyObject *signals;
sigset_t mask, previous;
int err;
@ -577,32 +611,7 @@ signal_pthread_sigmask(PyObject *self, PyObject *args)
if (PyErr_CheckSignals())
return NULL;
result = PyList_New(0);
if (result == NULL)
return NULL;
for (sig = 1; sig < NSIG; sig++) {
if (sigismember(&previous, sig) != 1)
continue;
/* Handle the case where it is a member by adding the signal to
the result list. Ignore the other cases because they mean the
signal isn't a member of the mask or the signal was invalid,
and an invalid signal must have been our fault in constructing
the loop boundaries. */
signum = PyLong_FromLong(sig);
if (signum == NULL) {
Py_DECREF(result);
return NULL;
}
if (PyList_Append(result, signum) == -1) {
Py_DECREF(signum);
Py_DECREF(result);
return NULL;
}
Py_DECREF(signum);
}
return result;
return sigset_to_set(previous);
}
PyDoc_STRVAR(signal_pthread_sigmask_doc,