Improve exception message raised by PyFloat_AsDouble if the object does not

have a nb_float slot.  This matches what PyInt_AsLong does.
This commit is contained in:
Neil Schemenauer 2002-11-18 16:06:21 +00:00
parent 26db587485
commit 2c77e90804
1 changed files with 6 additions and 2 deletions

View File

@ -202,12 +202,16 @@ PyFloat_AsDouble(PyObject *op)
if (op && PyFloat_Check(op))
return PyFloat_AS_DOUBLE((PyFloatObject*) op);
if (op == NULL || (nb = op->ob_type->tp_as_number) == NULL ||
nb->nb_float == NULL) {
if (op == NULL) {
PyErr_BadArgument();
return -1;
}
if ((nb = op->ob_type->tp_as_number) == NULL || nb->nb_float == NULL) {
PyErr_SetString(PyExc_TypeError, "a float is required");
return -1;
}
fo = (PyFloatObject*) (*nb->nb_float) (op);
if (fo == NULL)
return -1;