Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions packages/griffelib/src/griffe/_internal/expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,16 +468,20 @@ class ExprDictComp(Expr):

key: str | Expr
"""Target key."""
value: str | Expr
value: str | Expr | None
"""Target value."""
generators: Sequence[Expr]
"""Generators iterated on."""

def iterate(self, *, flat: bool = True) -> Iterator[str | Expr]:
yield "{"
yield from _yield(self.key, flat=flat)
yield ": "
yield from _yield(self.value, flat=flat)
if self.value:
yield from _yield(self.key, flat=flat)
yield ": "
yield from _yield(self.value, flat=flat)
else:
yield "**"
yield from _yield(self.key, flat=flat)
yield " "
yield from _join(self.generators, " ", flat=flat)
yield "}"
Expand Down Expand Up @@ -1261,7 +1265,7 @@ def _build_dict(node: ast.Dict, parent: Module | Class, **kwargs: Any) -> Expr:
def _build_dictcomp(node: ast.DictComp, parent: Module | Class, **kwargs: Any) -> Expr:
return ExprDictComp(
_build(node.key, parent, **kwargs),
_build(node.value, parent, **kwargs),
None if node.value is None else _build(node.value, parent, **kwargs),
[_build(gen, parent, **kwargs) for gen in node.generators],
)

Expand Down
11 changes: 11 additions & 0 deletions packages/griffelib/tests/test_expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,3 +311,14 @@ def test_render_dict_with_unpacking() -> None:
assert str(module["a"].value) == "{**base, 'x': 1}"
assert str(module["b"].value) == "{**d1, **d2}"
assert str(module["c"].value) == "{None: 1, 'y': 2}"


@pytest.mark.skipif(sys.version_info < (3, 15), reason="Unpackings in Comprehensions require Python 3.15+")
def test_render_dict_comprehension_with_unpacking() -> None:
"""Docstring stub."""
with temporary_visited_module(
"""
a = {**d for d in dicts}
""",
) as module:
assert str(module["a"].value) == "{**d for d in dicts}"
Loading