bpo-31497: Add private helper _PyType_Name(). (#3630)

serhiy-storchaka · web-flow · commit 4ab46d794961 · 2017-09-17T21:11:04.000+03:00
This function returns the last component of tp_name after a dot.
Returns tp_name itself if it doesn't contain a dot.
diff --git a/Include/object.h b/Include/object.h
@@ -501,6 +501,7 @@ PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t);
 PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *,
                                                PyObject *, PyObject *);
 #ifndef Py_LIMITED_API
+PyAPI_FUNC(const char *) _PyType_Name(PyTypeObject *);
 PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *);
 PyAPI_FUNC(PyObject *) _PyType_LookupId(PyTypeObject *, _Py_Identifier *);
 PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, _Py_Identifier *);
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
@@ -1284,7 +1284,7 @@ PyInit__functools(void)
 {
     int i;
     PyObject *m;
-    char *name;
+    const char *name;
     PyTypeObject *typelist[] = {
         &partial_type,
         &lru_cache_type,
@@ -1306,10 +1306,9 @@ PyInit__functools(void)
             Py_DECREF(m);
             return NULL;
         }
-        name = strchr(typelist[i]->tp_name, '.');
-        assert (name != NULL);
+        name = _PyType_Name(typelist[i]);
         Py_INCREF(typelist[i]);
-        PyModule_AddObject(m, name+1, (PyObject *)typelist[i]);
+        PyModule_AddObject(m, name, (PyObject *)typelist[i]);
     }
     return m;
 }
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
@@ -4630,7 +4630,7 @@ PyInit_itertools(void)
 {
     int i;
     PyObject *m;
-    char *name;
+    const char *name;
     PyTypeObject *typelist[] = {
         &accumulate_type,
         &combinations_type,
@@ -4663,10 +4663,9 @@ PyInit_itertools(void)
     for (i=0 ; typelist[i] != NULL ; i++) {
         if (PyType_Ready(typelist[i]) < 0)
             return NULL;
-        name = strchr(typelist[i]->tp_name, '.');
-        assert (name != NULL);
+        name = _PyType_Name(typelist[i]);
         Py_INCREF(typelist[i]);
-        PyModule_AddObject(m, name+1, (PyObject *)typelist[i]);
+        PyModule_AddObject(m, name, (PyObject *)typelist[i]);
     }
 
     return m;
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -116,13 +116,7 @@ BaseException_str(PyBaseExceptionObject *self)
 static PyObject *
 BaseException_repr(PyBaseExceptionObject *self)
 {
-    const char *name;
-    const char *dot;
-
-    name = Py_TYPE(self)->tp_name;
-    dot = (const char *) strrchr(name, '.');
-    if (dot != NULL) name = dot+1;
-
+    const char *name = _PyType_Name(Py_TYPE(self));
     return PyUnicode_FromFormat("%s%R", name, self->args);
 }
 
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
@@ -1471,16 +1471,9 @@ odict_repr(PyODictObject *self)
     int i;
     _Py_IDENTIFIER(items);
     PyObject *pieces = NULL, *result = NULL;
-    const char *classname;
-
-    classname = strrchr(Py_TYPE(self)->tp_name, '.');
-    if (classname == NULL)
-        classname = Py_TYPE(self)->tp_name;
-    else
-        classname++;
 
     if (PyODict_SIZE(self) == 0)
-        return PyUnicode_FromFormat("%s()", classname);
+        return PyUnicode_FromFormat("%s()", _PyType_Name(Py_TYPE(self)));
 
     i = Py_ReprEnter((PyObject *)self);
     if (i != 0) {
@@ -1532,7 +1525,8 @@ odict_repr(PyODictObject *self)
             goto Done;
     }
 
-    result = PyUnicode_FromFormat("%s(%R)", classname, pieces);
+    result = PyUnicode_FromFormat("%s(%R)",
+                                  _PyType_Name(Py_TYPE(self)), pieces);
 
 Done:
     Py_XDECREF(pieces);
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -388,24 +388,30 @@ check_set_special_type_attr(PyTypeObject *type, PyObject *value, const char *nam
     return 1;
 }
 
+const char *
+_PyType_Name(PyTypeObject *type)
+{
+    const char *s = strrchr(type->tp_name, '.');
+    if (s == NULL) {
+        s = type->tp_name;
+    }
+    else {
+        s++;
+    }
+    return s;
+}
+
 static PyObject *
 type_name(PyTypeObject *type, void *context)
 {
-    const char *s;
-
     if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
         PyHeapTypeObject* et = (PyHeapTypeObject*)type;
 
         Py_INCREF(et->ht_name);
         return et->ht_name;
     }
     else {
-        s = strrchr(type->tp_name, '.');
-        if (s == NULL)
-            s = type->tp_name;
-        else
-            s++;
-        return PyUnicode_FromString(s);
+        return PyUnicode_FromString(_PyType_Name(type));
     }
 }
 
@@ -418,7 +424,7 @@ type_qualname(PyTypeObject *type, void *context)
         return et->ht_qualname;
     }
     else {
-        return type_name(type, context);
+        return PyUnicode_FromString(_PyType_Name(type));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1284,7 +1284,7 @@ PyInit__functools(void)`
`1284`	`1284`	`{`
`1285`	`1285`	`int i;`
`1286`	`1286`	`PyObject *m;`
`1287`		`- char *name;`
	`1287`	`+ const char *name;`
`1288`	`1288`	`PyTypeObject *typelist[] = {`
`1289`	`1289`	`&partial_type,`
`1290`	`1290`	`&lru_cache_type,`
`@@ -1306,10 +1306,9 @@ PyInit__functools(void)`
`1306`	`1306`	`Py_DECREF(m);`
`1307`	`1307`	`return NULL;`
`1308`	`1308`	`}`
`1309`		`- name = strchr(typelist[i]->tp_name, '.');`
`1310`		`- assert (name != NULL);`
	`1309`	`+ name = _PyType_Name(typelist[i]);`
`1311`	`1310`	`Py_INCREF(typelist[i]);`
`1312`		`- PyModule_AddObject(m, name+1, (PyObject *)typelist[i]);`
	`1311`	`+ PyModule_AddObject(m, name, (PyObject *)typelist[i]);`
`1313`	`1312`	`}`
`1314`	`1313`	`return m;`
`1315`	`1314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,13 +116,7 @@ BaseException_str(PyBaseExceptionObject *self)`
`116`	`116`	`static PyObject *`
`117`	`117`	`BaseException_repr(PyBaseExceptionObject *self)`
`118`	`118`	`{`
`119`		`- const char *name;`
`120`		`- const char *dot;`
`121`		`-`
`122`		`- name = Py_TYPE(self)->tp_name;`
`123`		`- dot = (const char *) strrchr(name, '.');`
`124`		`- if (dot != NULL) name = dot+1;`
`125`		`-`
	`119`	`+ const char *name = _PyType_Name(Py_TYPE(self));`
`126`	`120`	`return PyUnicode_FromFormat("%s%R", name, self->args);`
`127`	`121`	`}`
`128`	`122`
Original file line number	Diff line number	Diff line change
`@@ -388,24 +388,30 @@ check_set_special_type_attr(PyTypeObject type, PyObject value, const char *nam`
`388`	`388`	`return 1;`
`389`	`389`	`}`
`390`	`390`
	`391`	`+const char *`
	`392`	`+_PyType_Name(PyTypeObject *type)`
	`393`	`+{`
	`394`	`+ const char *s = strrchr(type->tp_name, '.');`
	`395`	`+ if (s == NULL) {`
	`396`	`+ s = type->tp_name;`
	`397`	`+ }`
	`398`	`+ else {`
	`399`	`+ s++;`
	`400`	`+ }`
	`401`	`+ return s;`
	`402`	`+}`
	`403`	`+`
`391`	`404`	`static PyObject *`
`392`	`405`	`type_name(PyTypeObject type, void context)`
`393`	`406`	`{`
`394`		`- const char *s;`
`395`		`-`
`396`	`407`	`if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {`
`397`	`408`	`PyHeapTypeObject* et = (PyHeapTypeObject*)type;`
`398`	`409`
`399`	`410`	`Py_INCREF(et->ht_name);`
`400`	`411`	`return et->ht_name;`
`401`	`412`	`}`
`402`	`413`	`else {`
`403`		`- s = strrchr(type->tp_name, '.');`
`404`		`- if (s == NULL)`
`405`		`- s = type->tp_name;`
`406`		`- else`
`407`		`- s++;`
`408`		`- return PyUnicode_FromString(s);`
	`414`	`+ return PyUnicode_FromString(_PyType_Name(type));`
`409`	`415`	`}`
`410`	`416`	`}`
`411`	`417`
`@@ -418,7 +424,7 @@ type_qualname(PyTypeObject type, void context)`
`418`	`424`	`return et->ht_qualname;`
`419`	`425`	`}`
`420`	`426`	`else {`
`421`		`- return type_name(type, context);`
	`427`	`+ return PyUnicode_FromString(_PyType_Name(type));`
`422`	`428`	`}`
`423`	`429`	`}`
`424`	`430`