inspect.classify_class_attrs: Classify object.__new__ and __init__ correctly #18801
diff --git a/Lib/inspect.py b/Lib/inspect.py
index e6c7b5b..8de9892 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -412,7 +412,7 @@
elif isinstance(dict_obj, property):
kind = "property"
obj = dict_obj
- elif isfunction(obj) or ismethoddescriptor(obj):
+ elif isroutine(obj):
kind = "method"
else:
kind = "data"
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index f06b5b4..477f601 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -646,6 +646,10 @@
md = _BrokenMethodDescriptor()
attrs = attrs_wo_objs(A)
+
+ self.assertIn(('__new__', 'method', object), attrs, 'missing __new__')
+ self.assertIn(('__init__', 'method', object), attrs, 'missing __init__')
+
self.assertIn(('s', 'static method', A), attrs, 'missing static method')
self.assertIn(('c', 'class method', A), attrs, 'missing class method')
self.assertIn(('p', 'property', A), attrs, 'missing property')