Adjust __repr__ of generic descriptors (ones whose __objclass__ is type)

encukou · encukou · commit dc541cdcfcd2 · 2025-07-30T17:22:18.000+02:00
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
@@ -39,41 +39,41 @@ descr_name(PyDescrObject *descr)
 }
 
 static PyObject *
-descr_repr(PyDescrObject *descr, const char *format)
+descr_repr(PyDescrObject *descr, const char *kind)
 {
     PyObject *name = NULL;
     if (descr->d_name != NULL && PyUnicode_Check(descr->d_name))
         name = descr->d_name;
 
-    return PyUnicode_FromFormat(format, name, "?", descr->d_type->tp_name);
+    if (descr->d_type == &PyBaseObject_Type) {
+        return PyUnicode_FromFormat("<%s '%V'>", kind, name, "?");
+    }
+    return PyUnicode_FromFormat("<%s '%V' of '%s' objects>",
+                                kind, name, "?", descr->d_type->tp_name);
 }
 
 static PyObject *
 method_repr(PyObject *descr)
 {
-    return descr_repr((PyDescrObject *)descr,
-                      "<method '%V' of '%s' objects>");
+    return descr_repr((PyDescrObject *)descr, "method");
 }
 
 static PyObject *
 member_repr(PyObject *descr)
 {
-    return descr_repr((PyDescrObject *)descr,
-                      "<member '%V' of '%s' objects>");
+    return descr_repr((PyDescrObject *)descr, "member");
 }
 
 static PyObject *
 getset_repr(PyObject *descr)
 {
-    return descr_repr((PyDescrObject *)descr,
-                      "<attribute '%V' of '%s' objects>");
+    return descr_repr((PyDescrObject *)descr, "attribute");
 }
 
 static PyObject *
 wrapperdescr_repr(PyObject *descr)
 {
-    return descr_repr((PyDescrObject *)descr,
-                      "<slot wrapper '%V' of '%s' objects>");
+    return descr_repr((PyDescrObject *)descr, "slot wrapper");
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -39,41 +39,41 @@ descr_name(PyDescrObject *descr)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`static PyObject *`
`42`		`-descr_repr(PyDescrObject descr, const char format)`
	`42`	`+descr_repr(PyDescrObject descr, const char kind)`
`43`	`43`	`{`
`44`	`44`	`PyObject *name = NULL;`
`45`	`45`	`if (descr->d_name != NULL && PyUnicode_Check(descr->d_name))`
`46`	`46`	`name = descr->d_name;`
`47`	`47`
`48`		`- return PyUnicode_FromFormat(format, name, "?", descr->d_type->tp_name);`
	`48`	`+ if (descr->d_type == &PyBaseObject_Type) {`
	`49`	`+ return PyUnicode_FromFormat("<%s '%V'>", kind, name, "?");`
	`50`	`+ }`
	`51`	`+ return PyUnicode_FromFormat("<%s '%V' of '%s' objects>",`
	`52`	`+ kind, name, "?", descr->d_type->tp_name);`
`49`	`53`	`}`
`50`	`54`
`51`	`55`	`static PyObject *`
`52`	`56`	`method_repr(PyObject *descr)`
`53`	`57`	`{`
`54`		`- return descr_repr((PyDescrObject *)descr,`
`55`		`- "<method '%V' of '%s' objects>");`
	`58`	`+ return descr_repr((PyDescrObject *)descr, "method");`
`56`	`59`	`}`
`57`	`60`
`58`	`61`	`static PyObject *`
`59`	`62`	`member_repr(PyObject *descr)`
`60`	`63`	`{`
`61`		`- return descr_repr((PyDescrObject *)descr,`
`62`		`- "<member '%V' of '%s' objects>");`
	`64`	`+ return descr_repr((PyDescrObject *)descr, "member");`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`static PyObject *`
`66`	`68`	`getset_repr(PyObject *descr)`
`67`	`69`	`{`
`68`		`- return descr_repr((PyDescrObject *)descr,`
`69`		`- "<attribute '%V' of '%s' objects>");`
	`70`	`+ return descr_repr((PyDescrObject *)descr, "attribute");`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`static PyObject *`
`73`	`74`	`wrapperdescr_repr(PyObject *descr)`
`74`	`75`	`{`
`75`		`- return descr_repr((PyDescrObject *)descr,`
`76`		`- "<slot wrapper '%V' of '%s' objects>");`
	`76`	`+ return descr_repr((PyDescrObject *)descr, "slot wrapper");`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`static int`