Restore refactor lost in merge

mpage · mpage · commit 8b71951df67f · 2025-01-02T10:39:44.000-08:00
Use descriptor_is_class
diff --git a/Python/specialize.c b/Python/specialize.c
@@ -942,10 +942,8 @@ analyze_descriptor_load(PyTypeObject *type, PyObject *name, PyObject **descr, un
     PyObject *descriptor = _PyType_LookupRefAndVersion(type, name, &descr_version);
     *descr = descriptor;
     *tp_version = have_ga_version ? ga_version : descr_version;
-    if (PyUnicode_CompareWithASCIIString(name, "__class__") == 0) {
-        if (descriptor == _PyType_Lookup(&PyBaseObject_Type, name)) {
-            return DUNDER_CLASS;
-        }
+    if (descriptor_is_class(descriptor, name)) {
+        return DUNDER_CLASS;
     }
     return classify_descriptor(descriptor, has_getattr);
 }

Original file line number	Diff line number	Diff line change
`@@ -942,10 +942,8 @@ analyze_descriptor_load(PyTypeObject type, PyObject name, PyObject **descr, un`
`942`	`942`	`PyObject *descriptor = _PyType_LookupRefAndVersion(type, name, &descr_version);`
`943`	`943`	`*descr = descriptor;`
`944`	`944`	`*tp_version = have_ga_version ? ga_version : descr_version;`
`945`		`- if (PyUnicode_CompareWithASCIIString(name, "__class__") == 0) {`
`946`		`- if (descriptor == _PyType_Lookup(&PyBaseObject_Type, name)) {`
`947`		`- return DUNDER_CLASS;`
`948`		`- }`
	`945`	`+ if (descriptor_is_class(descriptor, name)) {`
	`946`	`+ return DUNDER_CLASS;`
`949`	`947`	`}`
`950`	`948`	`return classify_descriptor(descriptor, has_getattr);`
`951`	`949`	`}`