Use new message template

Author: donBarbos

Objects/abstract.c

@@ -884,8 +884,7 @@ PyObject_Format(PyObject *obj, PyObject *format_spec)
 
     if (result && !PyUnicode_Check(result)) {
         PyErr_Format(PyExc_TypeError,
-                     "__format__ must return a str, not %.200s",
-                     Py_TYPE(result)->tp_name);
+                     "__format__ must return type str (not %T)", result);
         Py_SETREF(result, NULL);
         goto done;
     }
@@ -1418,13 +1417,14 @@ _PyNumber_Index(PyObject *item)
 
     if (!PyLong_Check(result)) {
         PyErr_Format(PyExc_TypeError,
-                     "%T.__index__ returned non-int (type %T)", item, result);
+                     "%T.__index__ must return type int (not %T)",
+                     item, result);
         Py_DECREF(result);
         return NULL;
     }
     /* Issue #17576: warn if 'result' not of exact type int. */
     if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
-            "%T.__index__ returned non-int (type %T).  "
+            "%T.__index__ must return type int (not %T).  "
             "The ability to return an instance of a strict subclass of int "
             "is deprecated, and may be removed in a future version of Python.",
             item, result)) {
@@ -1527,13 +1527,14 @@ PyNumber_Long(PyObject *o)
 
         if (!PyLong_Check(result)) {
             PyErr_Format(PyExc_TypeError,
-                         "%T.__int__ returned non-int (type %T)", o, result);
+                         "%T.__int__ must return type int (not %T)",
+                         o, result);
             Py_DECREF(result);
             return NULL;
         }
         /* Issue #17576: warn if 'result' not of exact type int. */
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
-                "%T.__int__ returned non-int (type %T).  "
+                "%T.__int__ must return type int (not %T).  "
                 "The ability to return an instance of a strict subclass of int "
                 "is deprecated, and may be removed in a future version of Python.",
                 o, result)) {
@@ -1604,13 +1605,13 @@ PyNumber_Float(PyObject *o)
 
         if (!PyFloat_Check(res)) {
             PyErr_Format(PyExc_TypeError,
-                         "%T.__float__ returned non-float (type %T)", o, res);
+                         "%T.__float__ must return type float (not %T)", o, res);
             Py_DECREF(res);
             return NULL;
         }
         /* Issue #26983: warn if 'res' not of exact type float. */
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
-                "%T.__float__ returned non-float (type %T).  "
+                "%T.__float__ must return type float (not %T).  "
                 "The ability to return an instance of a strict subclass of float "
                 "is deprecated, and may be removed in a future version of Python.",
                 o, res)) {
@@ -2812,7 +2813,7 @@ PyObject_GetIter(PyObject *o)
         PyObject *res = (*f)(o);
         if (res != NULL && !PyIter_Check(res)) {
             PyErr_Format(PyExc_TypeError,
-                         "%T.iter() returned non-iterator of type '%T'",
+                         "%T.iter() must return type iterator of type '%T'",
                          o, res);
             Py_SETREF(res, NULL);
         }

Objects/bytesobject.c

@@ -567,7 +567,7 @@ format_obj(PyObject *v, const char **pbuf, Py_ssize_t *plen)
             return NULL;
         if (!PyBytes_Check(result)) {
             PyErr_Format(PyExc_TypeError,
-                         "%T.__bytes__ returned non-bytes (type %T)",
+                         "%T.__bytes__ must return type bytes (not %T)",
                          v, result);
             Py_DECREF(result);
             return NULL;
@@ -2762,7 +2762,7 @@ bytes_new_impl(PyTypeObject *type, PyObject *x, const char *encoding,
             return NULL;
         if (!PyBytes_Check(bytes)) {
             PyErr_Format(PyExc_TypeError,
-                         "%T.__bytes__ returned non-bytes (type %T)",
+                         "%T.__bytes__ must return type bytes (not %T)",
                          x, bytes);
             Py_DECREF(bytes);
             return NULL;

Objects/complexobject.c

@@ -499,14 +499,14 @@ try_complex_special_method(PyObject *op)
         }
         if (!PyComplex_Check(res)) {
             PyErr_Format(PyExc_TypeError,
-                "%T.__complex__ returned non-complex (type %T)",
+                "%T.__complex__ must return type complex (not %T)",
                 op, res);
             Py_DECREF(res);
             return NULL;
         }
         /* Issue #29894: warn if 'res' not of exact type complex. */
         if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
-                "%T.__complex__ returned non-complex (type %T).  "
+                "%T.__complex__ must return type complex (not %T).  "
                 "The ability to return an instance of a strict subclass of complex "
                 "is deprecated, and may be removed in a future version of Python.",
                 op, res)) {

Objects/object.c

@@ -779,7 +779,7 @@ PyObject_Repr(PyObject *v)
     }
     if (!PyUnicode_Check(res)) {
         _PyErr_Format(tstate, PyExc_TypeError,
-                      "%T.__repr__ returned non-string (type %T)", v, res);
+                      "%T.__repr__ must return type str (not %T)", v, res);
         Py_DECREF(res);
         return NULL;
     }
@@ -821,7 +821,7 @@ PyObject_Str(PyObject *v)
     }
     if (!PyUnicode_Check(res)) {
         _PyErr_Format(tstate, PyExc_TypeError,
-                      "%T.__str__ returned non-string (type %T)", v, res);
+                      "%T.__str__ must return type str (not %T)", v, res);
         Py_DECREF(res);
         return NULL;
     }
@@ -876,7 +876,7 @@ PyObject_Bytes(PyObject *v)
             return NULL;
         if (!PyBytes_Check(result)) {
             PyErr_Format(PyExc_TypeError,
-                         "%T.__bytes__ returned non-bytes (type %T)",
+                         "%T.__bytes__ must return type bytes (not %T)",
                          v, result);
             Py_DECREF(result);
             return NULL;

Objects/typeobject.c

@@ -2010,8 +2010,9 @@ type_get_annotations(PyObject *tp, void *Py_UNUSED(closure))
                 return NULL;
             }
             if (!PyDict_Check(annotations)) {
-                PyErr_Format(PyExc_TypeError, "__annotate__ returned non-dict of type '%.100s'",
-                             Py_TYPE(annotations)->tp_name);
+                PyErr_Format(PyExc_TypeError,
+                             "__annotate__ must return type dict of type '%T'",
+                             annotations);
                 Py_DECREF(annotations);
                 Py_DECREF(annotate);
                 Py_DECREF(dict);
@@ -9920,7 +9921,8 @@ slot_nb_bool(PyObject *self)
     }
     else {
         PyErr_Format(PyExc_TypeError,
-                     "%T.__bool__ returned non-bool (type %T)", self, value);
+                     "%T.__bool__ must return type bool (not %T)",
+                     self, value);
         result = -1;
     }