mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
Prompted by Tim's comment, when handle_range_longs() sees an
unexpected type, report the actual type rather than 'float'. (It's hard to even reach this code with a float. :-)
This commit is contained in:
parent
41c99e7f96
commit
817d6c9c9e
1 changed files with 9 additions and 9 deletions
|
@ -1366,24 +1366,24 @@ handle_range_longs(PyObject *self, PyObject *args)
|
||||||
Py_INCREF(istep);
|
Py_INCREF(istep);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX What reason do we have to believe that if an arg isn't an
|
|
||||||
* XXX int, it must be a float?
|
|
||||||
*/
|
|
||||||
if (!PyInt_Check(ilow) && !PyLong_Check(ilow)) {
|
if (!PyInt_Check(ilow) && !PyLong_Check(ilow)) {
|
||||||
PyErr_SetString(PyExc_ValueError,
|
PyErr_Format(PyExc_ValueError,
|
||||||
"integer start argument expected, got float.");
|
"integer start argument expected, got %s.",
|
||||||
|
ilow->ob_type->tp_name);
|
||||||
goto Fail;
|
goto Fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!PyInt_Check(ihigh) && !PyLong_Check(ihigh)) {
|
if (!PyInt_Check(ihigh) && !PyLong_Check(ihigh)) {
|
||||||
PyErr_SetString(PyExc_ValueError,
|
PyErr_Format(PyExc_ValueError,
|
||||||
"integer end argument expected, got float.");
|
"integer end argument expected, got %s.",
|
||||||
|
ihigh->ob_type->tp_name);
|
||||||
goto Fail;
|
goto Fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!PyInt_Check(istep) && !PyLong_Check(istep)) {
|
if (!PyInt_Check(istep) && !PyLong_Check(istep)) {
|
||||||
PyErr_SetString(PyExc_ValueError,
|
PyErr_Format(PyExc_ValueError,
|
||||||
"integer step argument expected, got float.");
|
"integer step argument expected, got %s.",
|
||||||
|
istep->ob_type->tp_name);
|
||||||
goto Fail;
|
goto Fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue