fix some tests

JelleZijlstra · JelleZijlstra · commit 6ab8b1e99e9e · 2023-04-23T15:48:09.000-06:00
diff --git a/Lib/test/test_type_params.py b/Lib/test/test_type_params.py
@@ -218,11 +218,12 @@ def method[T](self, arg: x): pass
 
     def test_class_scope_interaction_02(self):
         code = textwrap.dedent("""\
+            from typing import Generic
             class C:
                 class Base: pass
                 class Child[T](Base): pass
 
-            assert C.Child.__bases__ == (C.Base,)
+            assert C.Child.__bases__ == (C.Base, Generic)
         """)
         exec(code, {})
 
@@ -369,7 +370,7 @@ def get_typeparams():
 
         a, b, c, d = Outer.Inner.get_typeparams()
         self.assertEqual(Outer.__type_variables__, (a, b))
-        self.assertEqual(Outer.Inner.__type_variables__, (a, b, c, d))
+        self.assertEqual(Outer.Inner.__type_variables__, (c, d))
 
         self.assertEqual(Outer.__parameters__, (a, b))
         self.assertEqual(Outer.Inner.__parameters__, (c, d))
@@ -401,7 +402,7 @@ def inner[C, D]():
         inner = outer()
         a, b, c, d = inner()
         self.assertEqual(outer.__type_variables__, (a, b))
-        self.assertEqual(inner.__type_variables__, (a, b, c, d))
+        self.assertEqual(inner.__type_variables__, (c, d))
 
     def test_typeparams_dunder_function_02(self):
         def func1():
diff --git a/Objects/typevarobject.c b/Objects/typevarobject.c
@@ -240,9 +240,18 @@ typevar_reduce_impl(typevarobject *self)
     return PyUnicode_FromString(self->name);
 }
 
+static PyObject *
+typevar_mro_entries(PyObject *self, PyObject *args)
+{
+    PyErr_SetString(PyExc_TypeError,
+                    "Cannot subclass an instance of TypeVar");
+    return NULL;
+}
+
 static PyMethodDef typevar_methods[] = {
     TYPEVAR_TYPING_SUBST_METHODDEF
     TYPEVAR_REDUCE_METHODDEF
+    {"__mro_entries__", typevar_mro_entries, METH_O},
     {0}
 };
 
@@ -697,10 +706,19 @@ paramspec_reduce_impl(paramspecobject *self)
     return PyUnicode_FromString(self->name);
 }
 
+static PyObject *
+paramspec_mro_entries(PyObject *self, PyObject *args)
+{
+    PyErr_SetString(PyExc_TypeError,
+                    "Cannot subclass an instance of ParamSpec");
+    return NULL;
+}
+
 static PyMethodDef paramspec_methods[] = {
     PARAMSPEC_TYPING_SUBST_METHODDEF
     PARAMSPEC_TYPING_PREPARE_SUBST_METHODDEF
     PARAMSPEC_REDUCE_METHODDEF
+    {"__mro_entries__", paramspec_mro_entries, METH_O},
     {0}
 };
 
@@ -902,10 +920,19 @@ typevartuple_reduce_impl(typevartupleobject *self)
     return PyUnicode_FromString(self->name);
 }
 
+static PyObject *
+typevartuple_mro_entries(PyObject *self, PyObject *args)
+{
+    PyErr_SetString(PyExc_TypeError,
+                    "Cannot subclass an instance of TypeVarTuple");
+    return NULL;
+}
+
 static PyMethodDef typevartuple_methods[] = {
     TYPEVARTUPLE_TYPING_SUBST_METHODDEF
     TYPEVARTUPLE_TYPING_PREPARE_SUBST_METHODDEF
     TYPEVARTUPLE_REDUCE_METHODDEF
+    {"__mro_entries__", typevartuple_mro_entries, METH_O},
     {0}
 };
 
