Make error messages actually work

Author: Gobot1234

Include/internal/pycore_global_objects_fini_generated.h

@@ -482,6 +482,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(kw2)
         STRUCT_FOR_ID(lambda)
         STRUCT_FOR_ID(last)
+        STRUCT_FOR_ID(last_exc)
         STRUCT_FOR_ID(last_node)
         STRUCT_FOR_ID(last_traceback)
         STRUCT_FOR_ID(last_type)

Include/internal/pycore_global_strings.h

@@ -260,7 +260,9 @@ def _collect_parameters(args):
                 if t.__default__ is not None:
                     seen_default = True
                 elif seen_default:
-                    raise TypeError("TypeVarLike without a default follows one with a default")
+                    raise TypeError(
+                        f"TypeVarLike {t!r} without a default follows one with a default"
+                    )
 
                 parameters.append(t)
         else:
@@ -269,7 +271,9 @@ def _collect_parameters(args):
                     if x.__default__ is not None:
                         seen_default = True
                     elif seen_default:
-                        raise TypeError("TypeVarLike without a default follows one with a default")
+                        raise TypeError(
+                            f"TypeVarLike {t!r} without a default follows one with a default"
+                        )
 
                     parameters.append(x)
     return tuple(parameters)

Include/internal/pycore_runtime_init_generated.h

@@ -227,11 +227,7 @@ _Py_make_parameters(PyObject *args)
             Py_DECREF(parameters);
             return NULL;
         }
-        printf("Here\n");
         if (subst) {
-            printf("subst checking contains\n");
-            PyObject_Print(t, stdout, 0);
-            PyObject_Print(parameters, stdout, 0);
             PyObject *default_;
             bool does_not_contain = tuple_index(parameters, nargs, t) == -1;
             if (does_not_contain) {
@@ -240,13 +236,15 @@ _Py_make_parameters(PyObject *args)
                     Py_DECREF(subst);
                     return NULL;
                 }
-                PyObject_Print(default_, stdout, 0);
-                if (default_ && !!Py_IsNone(default_)) {
+                if (!Py_IsNone(default_)) {
                     seen_default = true;
                 } else if (seen_default) {
-                    PyErr_Format(PyExc_TypeError, "TypeVarLike without a default follows one with a default");
+                    return PyErr_Format(
+                        PyExc_TypeError,
+                        "type parameter %R without a default follows one with a default",
+                        t
+                    );
                 }
-                printf("\n%d seen default\n", seen_default);
             }
 
             iparam += tuple_add(parameters, iparam, t);
@@ -274,19 +272,21 @@ _Py_make_parameters(PyObject *args)
                     PyObject *default_;
                     PyObject *t2 = PyTuple_GET_ITEM(subparams, j);
 
-                    bool does_not_contain = tuple_index(parameters, nargs, t) == -1;
+                    bool does_not_contain = tuple_index(parameters, nargs, t2) == -1;
                     if (does_not_contain) {
                         if (_PyObject_LookupAttr(t2, &_Py_ID(__default__), &default_) < 0) {
                             Py_DECREF(default_);
                             Py_DECREF(subst);
                             return NULL;
                         }
-                        PyObject_Print(default_, stdout, 0);
-                        printf("\n%d seen default\n", seen_default);
-                        if (default_ && !!Py_IsNone(default_)) {
+                        if (default_ && !Py_IsNone(default_)) {
                             seen_default = true;
                         } else if (seen_default) {
-                            PyErr_Format(PyExc_TypeError, "TypeVarLike without a default follows one with a default");
+                            return PyErr_Format(
+                                PyExc_TypeError,
+                                "type parameter %R without a default follows one with a default",
+                                t2
+                            );
                         }
                     }
                     iparam += tuple_add(parameters, iparam, t2);