Skip to content
Merged
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
2 changes: 1 addition & 1 deletion packages/griffelib/src/griffe/_internal/expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ class ExprDict(Expr):
def iterate(self, *, flat: bool = True) -> Iterator[str | Expr]:
yield "{"
yield from _join(
(("None" if key is None else key, ": ", value) for key, value in zip(self.keys, self.values, strict=False)),
(("**", value) if key is None else (key, ": ", value) for key, value in zip(self.keys, self.values, strict=False)),
", ",
flat=flat,
)
Expand Down
19 changes: 19 additions & 0 deletions packages/griffelib/tests/test_expressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,3 +241,22 @@ def test_render_dict_comprehension() -> None:
""",
) as module:
assert str(module["d"].value) == "{k: v for k, v in items if k}"


def test_render_dict_with_unpacking() -> None:
"""Assert dictionaries using `**`-unpacking are rendered correctly.

The AST marks an unpacked value with a `None` key, which must render as
`**value` rather than as a literal `None` key. A genuine `None` literal key
(an `ast.Constant`, not the AST's unpacking marker) must be preserved.
"""
with temporary_visited_module(
"""
a = {**base, "x": 1}
b = {**d1, **d2}
c = {None: 1, "y": 2}
""",
) as module:
assert str(module["a"].value) == "{**base, 'x': 1}"
assert str(module["b"].value) == "{**d1, **d2}"
assert str(module["c"].value) == "{None: 1, 'y': 2}"
Loading