Real error for type_check

python · JelleZijlstra · May 16, 2023 · Apr 9, 2023 · Apr 13, 2023 · Apr 13, 2023
commit 43f02704d8709d64c2ea965f9c9d1d2f893dfcc4
@@ -443,6 +443,9 @@ def test_bound_errors(self):
             TypeVar('X', bound=Union)
         with self.assertRaises(TypeError):
             TypeVar('X', str, float, bound=Employee)
+        with self.assertRaisesRegex(TypeError,
+                                    r"Bound must be a type\. Got \(1, 2\)\."):
+            TypeVar('X', bound=(1, 2))
 
     def test_missing__name__(self):
         # See bpo-39942

@@ -71,14 +71,17 @@ call_typing_func_object(const char *name, PyObject *args)
 }
 
 static PyObject *
-type_check(PyObject *arg)
+type_check(PyObject *arg, const char *msg)
 {
     // Calling typing.py here leads to bootstrapping problems
     if (Py_IsNone(arg)) {
         return Py_NewRef(Py_TYPE(arg));
     }
-    // TODO: real error message
-    PyObject *args = PyTuple_Pack(2, arg, Py_None);
+    PyObject *message_str = PyUnicode_FromString(msg);
+    if (message_str == NULL) {
+        return NULL;
+    }
+    PyObject *args = PyTuple_Pack(2, arg, message_str);
     if (args == NULL) {
         return NULL;
     }
@@ -365,7 +368,7 @@ typevar_new_impl(PyTypeObject *type, const char *name, PyObject *constraints,
         bound = NULL;
     }
     if (bound != NULL) {
-        bound = type_check(bound);
+        bound = type_check(bound, "Bound must be a type.");
         if (bound == NULL) {
             return NULL;
         }
@@ -876,7 +879,7 @@ paramspec_new_impl(PyTypeObject *type, const char *name, PyObject *bound,
         return NULL;
     }
     if (bound != NULL) {
-        bound = type_check(bound);
+        bound = type_check(bound, "Bound must be a type.");
         if (bound == NULL) {
             return NULL;
         }