apply victor's comment

python · vstinner · Nov 6, 2020 · Nov 3, 2020 · Nov 3, 2020 · Nov 4, 2020
commit cca7bc7edf11a7d212ae70dcff6f10cf96fab470
diff --git a/Doc/c-api/type.rst b/Doc/c-api/type.rst
@@ -169,6 +169,11 @@ The following functions and structs are used to create
 
    .. versionadded:: 3.9
 
+   .. versionchanged:: 3.10
+
+      The ``Py_tp_doc`` slot now can accepts ``NULL`` value.
+      Previously, the slot may not be ``NULL``.
+
 .. c:function:: PyObject* PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
 
    Equivalent to ``PyType_FromModuleAndSpec(NULL, spec, bases)``.
@@ -259,8 +264,3 @@ The following functions and structs are used to create
 
       The desired value of the slot. In most cases, this is a pointer
       to a function.
-
-     .. versionchanged:: 3.10
-
-        The ``Py_tp_doc`` slot now can accepts ``NULL`` value.
-        Previously, the slot may not be ``NULL``.
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -7200,6 +7200,8 @@ PyInit__testcapi(void)
     }
     PyModule_AddObject(m, "HeapDocCType", HeapDocCType);
 
+    /* bpo-41832: Add a new type to test PyType_FromSpec()
+       now can accept a NULL tp_doc slot. */
     PyObject *NullTpDocType = PyType_FromSpec(&NullTpDocType_spec);
     if (NullTpDocType == NULL) {
         return NULL;

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -3012,8 +3012,6 @@ PyType_FromModuleAndSpec(PyObject *module, PyType_Spec *spec, PyObject *bases)
         else if (slot->slot == Py_tp_doc) {
             /* For the docstring slot, which usually points to a static string
                literal, we need to make a copy */
-
-            /* bpo-41832: PyType_FromModuleAndSpec() can accept tp_doc=NULL. */
             if (slot->pfunc == NULL) {
                 type->tp_doc = NULL;
                 continue;