let dynamic function docstrings take precedence over static ones, fix #…

…536
mitmproxy · Apr 24, 2023 · 0f8bc66 · 0f8bc66
1 parent c539e11
commit 0f8bc66
Show file tree

Hide file tree

Showing 5 changed files with 202 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 <!-- ✨ You do not need to add a pull request reference or an author, this will be added automatically by CI. ✨ -->
 
+ - Fix rendering of dynamically modified docstrings.
  - `pdoc.doc_ast.AstInfo` now has separate `func_docstrings` and `var_docstrings` attributes 
    instead of one combined one.
 

diff --git a/pdoc/doc.py b/pdoc/doc.py
@@ -317,7 +317,7 @@ def members(self) -> dict[str, Doc]:
                 )
             if self._var_docstrings.get(name):
                 doc.docstring = self._var_docstrings[name]
-            if self._func_docstrings.get(name):
+            if self._func_docstrings.get(name) and not doc.docstring:
                 doc.docstring = self._func_docstrings[name]
             members[doc.name] = doc