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. :-)

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index c8b784a6cafa66b8c76c7bd2c95d552a8380b082..aeb2d53b5d0f60c78de4b0d1f523cc66d64ae1c9 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1366,24 +1366,24 @@ handle_range_longs(PyObject *self, PyObject *args)
                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)) {
-               PyErr_SetString(PyExc_ValueError,
-                               "integer start argument expected, got float.");
+               PyErr_Format(PyExc_ValueError,
+                            "integer start argument expected, got %s.",
+                            ilow->ob_type->tp_name);
                goto Fail;
        }
 
        if (!PyInt_Check(ihigh) && !PyLong_Check(ihigh)) {
-               PyErr_SetString(PyExc_ValueError,
-                               "integer end argument expected, got float.");
+               PyErr_Format(PyExc_ValueError,
+                            "integer end argument expected, got %s.",
+                            ihigh->ob_type->tp_name);
                goto Fail;
        }
 
        if (!PyInt_Check(istep) && !PyLong_Check(istep)) {
-               PyErr_SetString(PyExc_ValueError,
-                       "integer step argument expected, got float.");
+               PyErr_Format(PyExc_ValueError,
+                            "integer step argument expected, got %s.",
+                            istep->ob_type->tp_name);
                goto Fail;
        }