PyType_GetName return a object

Author: shihai1991

Doc/c-api/type.rst

@@ -95,11 +95,9 @@ Type Objects
    from a type's base class.  Return ``0`` on success, or return ``-1`` and sets an
    exception on error.
 
-.. c:function:: const char* PyType_GetName(PyTypeObject *type)
+.. c:function:: PyObject* PyType_GetName(PyTypeObject *type)
 
-   Return the type's name. The returned pointer includes the module name
-   if type's name have a prefix of module name.
-   Callers can hold this pointer until the type has been deallocated.
+   Return the type's name. The returned object haven't a prefix of module name.
 
    .. versionadded:: 3.10
 

Doc/data/refcounts.dat

@@ -2309,7 +2309,7 @@ PyType_GenericNew:PyObject*:kwds:0:
 PyType_GetFlags:unsigned long:::
 PyType_GetFlags:PyTypeObject*:type:0:
 
-PyType_GetName:const char*:::
+PyType_GetName:PyObject*::+1:
 PyType_GetName:PyTypeObject*:type:0:
 
 PyType_GetSlot:void*:::

Doc/whatsnew/3.10.rst

@@ -606,7 +606,7 @@ New Features
 * The :c:func:`PyType_GetSlot` function can accept static types.
   (Contributed by Hai Shi and Petr Viktorin in :issue:`41073`.)
 
-* Add a new :c:func:`PyType_GetName` function to get type's name.
+* Add a new :c:func:`PyType_GetName` function to get type's short name.
   (Contributed by Hai Shi in :issue:`42035`.)
 
 

Include/object.h

@@ -233,7 +233,7 @@ PyAPI_FUNC(PyObject *) PyType_GetModule(struct _typeobject *);
 PyAPI_FUNC(void *) PyType_GetModuleState(struct _typeobject *);
 #endif
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03100000
-PyAPI_FUNC(const char *) PyType_GetName(PyTypeObject *);
+PyAPI_FUNC(PyObject *) PyType_GetName(PyTypeObject *);
 #endif
 
 /* Generic type check */

Misc/NEWS.d/next/C API/2020-12-23-01-28-50.bpo-42035.S9eUm0.rst

@@ -1 +1 @@
-Add a new :c:func:`PyType_GetName` function to get type's name.
+Add a new :c:func:`PyType_GetName` function to get type's short name.

Modules/_testcapimodule.c

@@ -1078,18 +1078,21 @@ test_get_statictype_slots(PyObject *self, PyObject *Py_UNUSED(ignored))
 static PyObject *
 test_get_type_name(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
-    const char *tp_name = PyType_GetName(&PyLong_Type);
-    assert(strcmp(tp_name, "int") == 0);
+    PyObject *tp_name = PyType_GetName(&PyLong_Type);
+    assert(strcmp(PyUnicode_AsUTF8(tp_name), "int") == 0);
+    Py_DECREF(tp_name);
 
     tp_name = PyType_GetName(&PyModule_Type);
-    assert(strcmp(tp_name, "module") == 0);
+    assert(strcmp(PyUnicode_AsUTF8(tp_name), "module") == 0);
+    Py_DECREF(tp_name);
 
     PyObject *HeapTypeNameType = PyType_FromSpec(&HeapTypeNameType_Spec);
     if (HeapTypeNameType == NULL) {
         Py_RETURN_NONE;
     }
     tp_name = PyType_GetName((PyTypeObject *)HeapTypeNameType);
-    assert(strcmp(tp_name, "_testcapi.HeapTypeNameType") == 0);
+    assert(strcmp(PyUnicode_AsUTF8(tp_name), "HeapTypeNameType") == 0);
+    Py_DECREF(tp_name);
 
     Py_DECREF(HeapTypeNameType);
     Py_RETURN_NONE;

Objects/typeobject.c

@@ -3152,15 +3152,16 @@ PyType_FromSpec(PyType_Spec *spec)
     return PyType_FromSpecWithBases(spec, NULL);
 }
 
-const char *
+PyObject *
 PyType_GetName(PyTypeObject *type)
 {
     assert(PyType_Check(type));
     if (_PyType_HasFeature(type, Py_TPFLAGS_HEAPTYPE)) {
-        PyTypeObject ht_type = ((PyHeapTypeObject *)type)->ht_type;
-        return ht_type.tp_name;
+        PyHeapTypeObject *ht_type = (PyHeapTypeObject *)type;
+        Py_INCREF(ht_type->ht_name);
+        return ht_type->ht_name;
     }
-    return type->tp_name;
+    return PyUnicode_FromString(_PyType_Name(type));
 }
 
 void *