From 6c7480b3f63a726995e9d20e8a3c8c4ebecc1111 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Tue, 9 Mar 2021 00:51:29 +0900 Subject: [PATCH 1/2] Fix #7119: autodoc: Broken doctree was generated by builtin_resolver The builtin_resolver() generates broken doctree unexpectedly if it contains pending_xref_condition nodes. --- sphinx/domains/python.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index 40a67f82cc7..1b5e18cdf8c 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -1301,6 +1301,10 @@ def istyping(s: str) -> bool: return s in typing.__all__ # type: ignore + content = find_pending_xref_condition(node, 'resolved') + if content: + contnode = content.children[0] + if node.get('refdomain') != 'py': return None elif node.get('reftype') in ('class', 'obj') and node.get('reftarget') == 'None': From 5b5730ef4e7a28216f1c402f7e2c955c077c5ac3 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Mon, 15 Mar 2021 00:46:19 +0900 Subject: [PATCH 2/2] Avoid a mypy warning --- sphinx/domains/python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index 1b5e18cdf8c..7175c9b86f5 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -1303,7 +1303,7 @@ def istyping(s: str) -> bool: content = find_pending_xref_condition(node, 'resolved') if content: - contnode = content.children[0] + contnode = content.children[0] # type: ignore if node.get('refdomain') != 'py': return None