Fix #7178: autodoc: TypeError is raised on fetching type annotations

sphinx-doc · Feb 18, 2020 · 5b84938 · 5b84938
1 parent 011bdeb
commit 5b84938
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -21,6 +21,7 @@ Bugs fixed
 * #7156: autodoc: separator for keyword only arguments is not shown
 * #7146: autodoc: IndexError is raised on suppressed type_comment found
 * #7161: autodoc: typehints extension does not support parallel build
+* #7178: autodoc: TypeError is raised on fetching type annotations
 * #7151: crashed when extension assigns a value to ``env.indexentries``
 * #7170: text: Remove debug print
 * #7137: viewcode: Avoid to crash when non-python code given

diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
@@ -1236,7 +1236,7 @@ def add_directive_header(self, sig: str) -> None:
         if not self.options.annotation:
             # obtain annotation for this data
             annotations = getattr(self.parent, '__annotations__', {})
-            if self.objpath[-1] in annotations:
+            if annotations and self.objpath[-1] in annotations:
                 objrepr = stringify_typehint(annotations.get(self.objpath[-1]))
                 self.add_line('   :type: ' + objrepr, sourcename)
             else:
@@ -1424,7 +1424,7 @@ def add_directive_header(self, sig: str) -> None:
             if not self._datadescriptor:
                 # obtain annotation for this attribute
                 annotations = getattr(self.parent, '__annotations__', {})
-                if self.objpath[-1] in annotations:
+                if annotations and self.objpath[-1] in annotations:
                     objrepr = stringify_typehint(annotations.get(self.objpath[-1]))
                     self.add_line('   :type: ' + objrepr, sourcename)
                 else: