#17080: improve error message of float/complex when the wrong type is passed.

ezio-melotti · ezio-melotti · commit a5b959953808 · 2013-11-07T19:18:34.000+02:00
diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
@@ -303,6 +303,7 @@ def split_zeros(x):
         self.assertRaises(TypeError, float, 5+3j)
         self.assertRaises(ValueError, complex, "")
         self.assertRaises(TypeError, complex, None)
+        self.assertRaisesRegex(TypeError, "not 'NoneType'", complex, None)
         self.assertRaises(ValueError, complex, "\0")
         self.assertRaises(ValueError, complex, "3\09")
         self.assertRaises(TypeError, complex, "1", "2")
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
@@ -41,6 +41,7 @@ def test_float(self):
         self.assertRaises(ValueError, float, "-.")
         self.assertRaises(ValueError, float, b"-")
         self.assertRaises(TypeError, float, {})
+        self.assertRaisesRegex(TypeError, "not 'dict'", float, {})
         # Lone surrogate
         self.assertRaises(UnicodeEncodeError, float, '\uD8F0')
         # check that we don't accept alternate exponent markers
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
@@ -773,8 +773,9 @@ complex_subtype_from_string(PyTypeObject *type, PyObject *v)
             goto error;
     }
     else if (PyObject_AsCharBuffer(v, &s, &len)) {
-        PyErr_SetString(PyExc_TypeError,
-                        "complex() argument must be a string or a number");
+        PyErr_Format(PyExc_TypeError,
+            "complex() argument must be a string or a number, not '%.200s'",
+            Py_TYPE(v)->tp_name);
         return NULL;
     }
 
@@ -953,8 +954,9 @@ complex_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         nbi = i->ob_type->tp_as_number;
     if (nbr == NULL || nbr->nb_float == NULL ||
         ((i != NULL) && (nbi == NULL || nbi->nb_float == NULL))) {
-        PyErr_SetString(PyExc_TypeError,
-                   "complex() argument must be a string or a number");
+        PyErr_Format(PyExc_TypeError,
+            "complex() argument must be a string or a number, not '%.200s'",
+            Py_TYPE(r)->tp_name);
         if (own_r) {
             Py_DECREF(r);
         }
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
@@ -144,8 +144,9 @@ PyFloat_FromString(PyObject *v)
         }
     }
     else if (PyObject_AsCharBuffer(v, &s, &len)) {
-        PyErr_SetString(PyExc_TypeError,
-            "float() argument must be a string or a number");
+        PyErr_Format(PyExc_TypeError,
+            "float() argument must be a string or a number, not '%.200s'",
+            Py_TYPE(v)->tp_name);
         return NULL;
     }
     last = s + len;

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,9 @@ PyFloat_FromString(PyObject *v)`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`else if (PyObject_AsCharBuffer(v, &s, &len)) {`
`147`		`- PyErr_SetString(PyExc_TypeError,`
`148`		`- "float() argument must be a string or a number");`
	`147`	`+ PyErr_Format(PyExc_TypeError,`
	`148`	`+ "float() argument must be a string or a number, not '%.200s'",`
	`149`	`+ Py_TYPE(v)->tp_name);`
`149`	`150`	`return NULL;`
`150`	`151`	`}`
`151`	`152`	`last = s + len;`