python · miss-islington · Nov 10, 2020 · Jul 8, 2020 · Jul 8, 2020 · Jul 9, 2020
diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
@@ -105,10 +105,11 @@ Type Objects
 
    See :c:member:`PyType_Slot.slot` for possible values of the *slot* argument.
 
-   An exception is raised if *type* is not a heap type.
-
    .. versionadded:: 3.4
 
+   .. versionchanged:: 3.10
+      :c:func:`PyType_GetSlot` could accept static types.
+
 .. c:function:: PyObject* PyType_GetModule(PyTypeObject *type)
 
    Return the module object associated with the given type when the type was

diff --git a/Include/typeslots.h b/Include/typeslots.h
@@ -88,3 +88,43 @@
 /* New in 3.5 */
 #define Py_tp_finalize 80
 #endif
+/* New in 3.10 */
+#if defined(Py_LIMITED_API)
+#undef Py_tp_as_async
+#undef Py_tp_as_buffer
+#undef Py_tp_as_mapping
+#undef Py_tp_as_number
+#undef Py_tp_as_sequence
+#undef Py_tp_basicsize
+#undef Py_tp_cache
+#undef Py_tp_dict
+#undef Py_tp_dictoffset
+#undef Py_tp_flags
+#undef Py_tp_itemsize
+#undef Py_tp_mro
+#undef Py_tp_name
+#undef Py_tp_subclasses
+#undef Py_tp_vectorcall_offset
+#undef Py_tp_version_tag
+#undef Py_tp_weaklist
+#undef Py_tp_weaklistoffset
+#else
+#define Py_tp_as_async 81
+#define Py_tp_as_buffer 82
+#define Py_tp_as_mapping 83
+#define Py_tp_as_number 84
+#define Py_tp_as_sequence 85
+#define Py_tp_basicsize 86
+#define Py_tp_cache 87
+#define Py_tp_dict 88
+#define Py_tp_dictoffset 89
+#define Py_tp_flags 90
+#define Py_tp_itemsize 91
+#define Py_tp_mro 92
+#define Py_tp_name 93
+#define Py_tp_subclasses 94
+#define Py_tp_vectorcall_offset 95
+#define Py_tp_version_tag 96
+#define Py_tp_weaklist 97
+#define Py_tp_weaklistoffset 98
+#endif
diff --git a/Misc/NEWS.d/next/C API/2020-07-08-21-01-49.bpo-41073.VqQZON.rst b/Misc/NEWS.d/next/C API/2020-07-08-21-01-49.bpo-41073.VqQZON.rst
@@ -0,0 +1 @@
+:c:func:`PyType_GetSlot()` could accept static types.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -1018,6 +1018,35 @@ test_buildvalue_N(PyObject *self, PyObject *Py_UNUSED(ignored))
 }
 
 
+static PyObject *
+test_get_statictype_slots(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    char *tp_name = PyType_GetSlot(&PyLong_Type, Py_tp_name);
+    assert(strcmp(tp_name, "int") == 0);
+
+    newfunc tp_new = PyType_GetSlot(&PyLong_Type, Py_tp_new);
+    PyObject *args = PyTuple_New(0);
+    PyObject *object = tp_new(&PyLong_Type, args, NULL);
+    assert(object);
+
+    reprfunc tp_repr = PyType_GetSlot(&PyLong_Type, Py_tp_repr);
+    PyObject *decimal_str = tp_repr(object);
+    assert(decimal_str);
+
+    PyNumberMethods *tp_as_number = PyType_GetSlot(&PyLong_Type,
+                                                   Py_tp_as_number);
+    PyObject *object2 = tp_new(&PyLong_Type, args, NULL);
+    PyObject *res = tp_as_number->nb_add(object, object2);
+    assert(res);
+
+    Py_DECREF(res);
+    Py_DECREF(decimal_str);
+    Py_DECREF(args);
+    Py_DECREF(object);
+    Py_RETURN_NONE;
+}
+
+
 static PyObject *
 get_args(PyObject *self, PyObject *args)
 {
@@ -5606,6 +5635,7 @@ static PyMethodDef TestMethods[] = {
     {"test_buildvalue_N",       test_buildvalue_N,               METH_NOARGS},
     {"test_buildvalue_issue38913", test_buildvalue_issue38913,   METH_NOARGS},
     {"get_args", get_args, METH_VARARGS},
+    {"test_get_statictype_slots", test_get_statictype_slots, METH_NOARGS},
        {"get_kwargs", (PyCFunction)(void(*)(void))get_kwargs, METH_VARARGS|METH_KEYWORDS},
     {"getargs_tuple",           getargs_tuple,                   METH_VARARGS},
     {"getargs_keywords", (PyCFunction)(void(*)(void))getargs_keywords,

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -3110,7 +3110,7 @@ PyType_FromSpec(PyType_Spec *spec)
 void *
 PyType_GetSlot(PyTypeObject *type, int slot)
 {
-    if (!_PyType_HasFeature(type, Py_TPFLAGS_HEAPTYPE) || slot < 0) {
+    if (slot < 0) {
         PyErr_BadInternalCall();
         return NULL;
     }

diff --git a/Objects/typeslots.inc b/Objects/typeslots.inc
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		:c:func:`PyType_GetSlot()` could accept static types.