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

nnorwitz · nnorwitz · commit 5e28a9911345 · 2002-07-28T15:12:10.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@27799 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
@@ -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) 
