Close #18929: inspect.classify_class_attrs will now search the metaclasses (last...

diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst
index 9f784fd674e423d48d326e24813887a030d908be..aabf85d5113d5915a3f9e570d5994e0700a6e001 100644 (file)
--- a/Doc/library/inspect.rst
+++ b/Doc/library/inspect.rst
@@ -173,8 +173,9 @@ attributes:
 
    .. note::
 
-      :func:`getmembers` does not return metaclass attributes when the argument
-      is a class (this behavior is inherited from the :func:`dir` function).
+      :func:`getmembers` will only return metaclass attributes when the
+      argument is a class and those attributes have been listed in a custom
+      :meth:`__dir__`.
 
 
 .. function:: getmoduleinfo(path)

diff --git a/Lib/inspect.py b/Lib/inspect.py
index 51b771760f74231e8cfc2ac482faeed8048b211c..371bb355ba2b9b1ff71f7a45a5116df3be39befc 100644 (file)
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -308,9 +308,14 @@ def classify_class_attrs(cls):
            data attributes:  C.data is just a data object, but
            C.__dict__['data'] may be a data descriptor with additional
            info, like a __doc__ string.
+
+    If one of the items in dir(cls) is stored in the metaclass it will now
+    be discovered and not have None be listed as the class in which it was
+    defined.
     """
 
     mro = getmro(cls)
+    metamro = getmro(type(cls)) # for attributes stored in the metaclass
     names = dir(cls)
     result = []
     for name in names:
@@ -321,7 +326,7 @@ def classify_class_attrs(cls):
         # getattr(). This is the case with some descriptors (bug #1785).
         # Thus, we only use getattr() as a last resort.
         homecls = None
-        for base in (cls,) + mro:
+        for base in (cls,) + mro + metamro:
             if name in base.__dict__:
                 obj = base.__dict__[name]
                 homecls = base