diff --git a/CHANGES b/CHANGES index b48699ed2..2e34e41da 100644 --- a/CHANGES +++ b/CHANGES @@ -47,6 +47,9 @@ Features added Bugs fixed ---------- +* #7461: py domain: fails with IndexError for empty tuple in type annotation +* #7461: autodoc: empty tuple in type annotation is not shown correctly + Testing -------- diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py index 3ca730e30..52b670ad4 100644 --- a/sphinx/domains/python.py +++ b/sphinx/domains/python.py @@ -114,11 +114,16 @@ def _parse_annotation(annotation: str) -> List[Node]: result.append(addnodes.desc_sig_punctuation('', ']')) return result elif isinstance(node, ast.Tuple): - result = [] - for elem in node.elts: - result.extend(unparse(elem)) - result.append(addnodes.desc_sig_punctuation('', ', ')) - result.pop() + if node.elts: + result = [] + for elem in node.elts: + result.extend(unparse(elem)) + result.append(addnodes.desc_sig_punctuation('', ', ')) + result.pop() + else: + result = [addnodes.desc_sig_punctuation('', '('), + addnodes.desc_sig_punctuation('', ')')] + return result else: raise SyntaxError # unsupported syntax diff --git a/sphinx/pycode/ast.py b/sphinx/pycode/ast.py index 4d8aa8955..fb2a7152d 100644 --- a/sphinx/pycode/ast.py +++ b/sphinx/pycode/ast.py @@ -114,7 +114,10 @@ def unparse(node: ast.AST) -> str: elif isinstance(node, ast.UnaryOp): return "%s %s" % (unparse(node.op), unparse(node.operand)) elif isinstance(node, ast.Tuple): - return ", ".join(unparse(e) for e in node.elts) + if node.elts: + return ", ".join(unparse(e) for e in node.elts) + else: + return "()" elif sys.version_info > (3, 6) and isinstance(node, ast.Constant): # this branch should be placed at last return repr(node.value) diff --git a/tests/test_domain_py.py b/tests/test_domain_py.py index cc3d3cf53..e330ba634 100644 --- a/tests/test_domain_py.py +++ b/tests/test_domain_py.py @@ -255,6 +255,13 @@ def test_parse_annotation(): [pending_xref, "int"], [desc_sig_punctuation, "]"])) + doctree = _parse_annotation("Tuple[()]") + assert_node(doctree, ([pending_xref, "Tuple"], + [desc_sig_punctuation, "["], + [desc_sig_punctuation, "("], + [desc_sig_punctuation, ")"], + [desc_sig_punctuation, "]"])) + doctree = _parse_annotation("Callable[[int, int], int]") assert_node(doctree, ([pending_xref, "Callable"], [desc_sig_punctuation, "["], diff --git a/tests/test_pycode_ast.py b/tests/test_pycode_ast.py index 117feb8f7..9b12d24d5 100644 --- a/tests/test_pycode_ast.py +++ b/tests/test_pycode_ast.py @@ -54,6 +54,7 @@ from sphinx.pycode import ast ("- 1", "- 1"), # UnaryOp ("- a", "- a"), # USub ("(1, 2, 3)", "1, 2, 3"), # Tuple + ("()", "()"), # Tuple (empty) ]) def test_unparse(source, expected): module = ast.parse(source)