traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SF patch #577031, remove PyArg_Parse() since it's deprecated

This commit is contained in:
Neal Norwitz 2002-07-28 15:12:10 +00:00
parent 4ddfd50d85
commit 77c72bb323
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/selectmodule.c
View File

@ -208,12 +208,17 @@ select_select(PyObject *self, PyObject *args)
if (tout == Py_None)
tvp = (struct timeval *)0;
else if (!PyArg_Parse(tout, "d", &timeout)) {
else if (!PyNumber_Check(tout)) {
PyErr_SetString(PyExc_TypeError,
"timeout must be a float or None");
return NULL;
}
else {
tout = PyNumber_Float(tout);
if (!tout)
return NULL;
timeout = PyFloat_AS_DOUBLE(tout);
Py_DECREF(tout);
if (timeout > (double)LONG_MAX) {
PyErr_SetString(PyExc_OverflowError,
"timeout period too long");
@ -450,11 +455,18 @@ poll_poll(pollObject *self, PyObject *args)
/* Check values for timeout */
if (tout == NULL || tout == Py_None)
timeout = -1;
else if (!PyArg_Parse(tout, "i", &timeout)) {
else if (!PyNumber_Check(tout)) {
PyErr_SetString(PyExc_TypeError,
"timeout must be an integer or None");
return NULL;
}
else {
tout = PyNumber_Int(tout);
if (!tout)
return NULL;
timeout = PyInt_AS_LONG(tout);
Py_DECREF(tout);
}
/* Ensure the ufd array is up to date */
if (!self->ufd_uptodate)