Merge pull request #8570 from tk0miya/8569_getslots_TypeError

Fixes #8568. Ignore TypeError from getslots in isslotsattribute
sphinx-doc · Dec 21, 2020 · 31cad2e · 31cad2e
2 parents 97a0bab + b3292b5
commit 31cad2e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -18,6 +18,7 @@ Bugs fixed
 
 * #8559: autodoc: AttributeError is raised when using forward-reference type
   annotations
+* #8568: autodoc: TypeError is raised on checking slots attribute
 
 Testing
 --------

diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
@@ -2114,7 +2114,7 @@ def isslotsattribute(self) -> bool:
                 return True
             else:
                 return False
-        except (AttributeError, ValueError):
+        except (AttributeError, ValueError, TypeError):
             return False
 
     def import_object(self, raiseerror: bool = False) -> bool:

diff --git a/sphinx/util/inspect.py b/sphinx/util/inspect.py
@@ -187,6 +187,7 @@ def getslots(obj: Any) -> Optional[Dict]:
 
     Return None if gienv *obj* does not have __slots__.
     Raises AttributeError if given *obj* raises an error on accessing __slots__.
+    Raises TypeError if given *obj* is not a class.
     Raises ValueError if given *obj* have invalid __slots__.
     """
     if not inspect.isclass(obj):