From 6f8d9390df41d377621020767b00e35601474871 Mon Sep 17 00:00:00 2001
From: Pawel Budzynski <pawel.budzynski@cern.ch>
Date: Thu, 29 Apr 2021 14:15:51 +0200
Subject: [PATCH] autosummary includes instance attributes

---
 sphinx/ext/autosummary/__init__.py |  5 +++--
 sphinx/ext/autosummary/generate.py | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index c29714ad4..5071921cc 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -662,8 +662,9 @@ def import_ivar_by_name(name: str, prefixes: List[str] = [None]) -> Tuple[str, A
         name, attr = name.rsplit(".", 1)
         real_name, obj, parent, modname = import_by_name(name, prefixes)
         qualname = real_name.replace(modname + ".", "")
-        analyzer = ModuleAnalyzer.for_module(modname)
-        if (qualname, attr) in analyzer.find_attr_docs():
+        analyzer = ModuleAnalyzer.for_module(getattr(obj, '__module__', modname))
+        analyzer.analyze()
+        if (qualname, attr) in analyzer.attr_docs or (qualname, attr) in analyzer.annotations:
             return real_name + "." + attr, INSTANCEATTR, obj, modname
     except (ImportError, ValueError, PycodeError):
         pass
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index d1130d096..107b87605 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -239,15 +239,21 @@ def generate_autosummary_content(name: str, obj: Any, parent: Any,
                            name, exc, type='autosummary')
             return False
 
+    def attr_getter(obj, name, *defargs):
+        return sphinx.ext.autodoc.autodoc_attrgetter(app, obj, name, *defargs)
+
+    def get_all_members(obj):
+        all_members = sphinx.ext.autodoc.get_class_members(obj, [qualname], attr_getter)
+        return all_members
+
     def get_members(obj: Any, types: Set[str], include_public: List[str] = [],
                     imported: bool = True) -> Tuple[List[str], List[str]]:
         items: List[str] = []
         public: List[str] = []
-        for name in dir(obj):
-            try:
-                value = safe_getattr(obj, name)
-            except AttributeError:
-                continue
+
+        all_members = get_all_members(obj)
+        for name, member in all_members.items():
+            value = member.object
             documenter = get_documenter(app, value, obj)
             if documenter.objtype in types:
                 # skip imported members if expected