bpo-24011: Use PyModule_Add{Object,IntMacro} in PyInit__signal() (GH-12765)

This commit is contained in:
Joannah Nanjekye 2019-04-21 21:47:06 -04:00 committed by Berker Peksag
parent 5ebfa840a1
commit 9541bd321a
1 changed files with 5 additions and 7 deletions

View File

@ -1350,17 +1350,15 @@ PyInit__signal(void)
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
x = DefaultHandler = PyLong_FromVoidPtr((void *)SIG_DFL); x = DefaultHandler = PyLong_FromVoidPtr((void *)SIG_DFL);
if (!x || PyDict_SetItemString(d, "SIG_DFL", x) < 0) if (PyModule_AddObject(m, "SIG_DFL", x))
goto finally; goto finally;
x = IgnoreHandler = PyLong_FromVoidPtr((void *)SIG_IGN); x = IgnoreHandler = PyLong_FromVoidPtr((void *)SIG_IGN);
if (!x || PyDict_SetItemString(d, "SIG_IGN", x) < 0) if (PyModule_AddObject(m, "SIG_IGN", x))
goto finally; goto finally;
x = PyLong_FromLong((long)NSIG); if (PyModule_AddIntMacro(m, NSIG))
if (!x || PyDict_SetItemString(d, "NSIG", x) < 0)
goto finally; goto finally;
Py_DECREF(x);
#ifdef SIG_BLOCK #ifdef SIG_BLOCK
if (PyModule_AddIntMacro(m, SIG_BLOCK)) if (PyModule_AddIntMacro(m, SIG_BLOCK))
@ -1569,8 +1567,8 @@ PyInit__signal(void)
#if defined (HAVE_SETITIMER) || defined (HAVE_GETITIMER) #if defined (HAVE_SETITIMER) || defined (HAVE_GETITIMER)
ItimerError = PyErr_NewException("signal.ItimerError", ItimerError = PyErr_NewException("signal.ItimerError",
PyExc_OSError, NULL); PyExc_OSError, NULL);
if (ItimerError != NULL) if (PyModule_AddObject(m, "ItimerError", ItimerError))
PyDict_SetItemString(d, "ItimerError", ItimerError); goto finally;
#endif #endif
#ifdef CTRL_C_EVENT #ifdef CTRL_C_EVENT