Merge branch '4.0.x' into 9188_warning_for_autosummary_generate

sphinx-doc · May 10, 2021 · 88ef2b3 · 88ef2b3
2 parents ab6ec71 + 7c16981
commit 88ef2b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -16,6 +16,8 @@ Features added
 Bugs fixed
 ----------
 
+* #9189: autodoc: crashed when ValueError is raised on generating signature
+  from a property of the class
 * #9188: autosummary: warning is emitted if list value is set to
   autosummary_generate
 

diff --git a/sphinx/ext/autodoc/__init__.py b/sphinx/ext/autodoc/__init__.py
@@ -2570,7 +2570,7 @@ def add_directive_header(self, sig: str) -> None:
                                self.fullname, exc)
                 return None
             except ValueError:
-                raise
+                return None
 
 
 class NewTypeAttributeDocumenter(AttributeDocumenter):