Update by review comments

Author: aisk

Lib/test/test_capi/test_misc.py

@@ -921,11 +921,11 @@ def test_tp_bases_slot(self):
         self.assertEqual(cls.__bases__, (int,))
         self.assertEqual(cls.__base__, int)
 
-    def test_tp_bases_slot_invalid(self):
+    def test_tp_bases_slot_none(self):
         self.assertRaisesRegex(
             SystemError,
             "Py_tp_bases is not a tuple",
-            _testcapi.create_heapctype_with_invalid_bases_slot
+            _testcapi.create_heapctype_with_none_bases_slot
         )
 
 

Modules/_testcapi/heaptype.c

@@ -543,23 +543,23 @@ pytype_getmodulebytoken(PyObject *self, PyObject *args)
     return PyType_GetModuleByToken((PyTypeObject *)type, token);
 }
 
-static PyType_Slot HeapCTypeWithBasesSlotInvalid_slots[] = {
+static PyType_Slot HeapCTypeWithBasesSlotNone_slots[] = {
     {Py_tp_bases, NULL},  /* filled out with Py_None in runtime */
     {0, 0},
 };
 
-static PyType_Spec HeapCTypeWithBasesSlotInvalid_spec = {
-    .name = "_testcapi.HeapCTypeWithBasesSlotInvalid",
+static PyType_Spec HeapCTypeWithBasesSlotNone_spec = {
+    .name = "_testcapi.HeapCTypeWithBasesSlotNone",
     .basicsize = sizeof(PyObject),
     .flags = Py_TPFLAGS_DEFAULT,
-    .slots = HeapCTypeWithBasesSlotInvalid_slots
+    .slots = HeapCTypeWithBasesSlotNone_slots
 };
 
 static PyObject *
-create_heapctype_with_invalid_bases_slot(PyObject *self, PyObject *Py_UNUSED(ignored))
+create_heapctype_with_none_bases_slot(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    HeapCTypeWithBasesSlotInvalid_slots[0].pfunc = Py_None;
-    return PyType_FromSpec(&HeapCTypeWithBasesSlotInvalid_spec);
+    HeapCTypeWithBasesSlotNone_slots[0].pfunc = Py_None;
+    return PyType_FromSpec(&HeapCTypeWithBasesSlotNone_spec);
 }
 
 
@@ -581,8 +581,8 @@ static PyMethodDef TestMethods[] = {
     {"pytype_getbasebytoken", pytype_getbasebytoken, METH_VARARGS},
     {"pytype_getmodulebydef", pytype_getmodulebydef, METH_O},
     {"pytype_getmodulebytoken", pytype_getmodulebytoken, METH_VARARGS},
-    {"create_heapctype_with_invalid_bases_slot",
-        create_heapctype_with_invalid_bases_slot, METH_NOARGS},
+    {"create_heapctype_with_none_bases_slot",
+        create_heapctype_with_none_bases_slot, METH_NOARGS},
     {NULL},
 };
 
@@ -1472,6 +1472,9 @@ _PyTestCapi_Init_Heaptype(PyObject *m) {
     HeapCTypeWithBasesSlot_slots[0].pfunc = bases;
     PyObject *HeapCTypeWithBasesSlot = PyType_FromSpec(&HeapCTypeWithBasesSlot_spec);
     Py_DECREF(bases);
+    if (HeapCTypeWithBasesSlot == NULL) {
+        return -1;
+    }
     ADD("HeapCTypeWithBasesSlot", HeapCTypeWithBasesSlot);
 
     ADD("Py_TP_USE_SPEC", PyLong_FromVoidPtr(Py_TP_USE_SPEC));