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
22 changes: 10 additions & 12 deletions Lib/ast.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,18 +147,16 @@ def _format(node, level=0):
if value is None and getattr(cls, name, ...) is None:
keywords = True
continue
if (
not show_empty
and (value is None or value == [])
# Special cases:
# `Constant(value=None)` and `MatchSingleton(value=None)`
and not isinstance(node, (Constant, MatchSingleton))
):
args_buffer.append(repr(value))
continue
elif not keywords:
args.extend(args_buffer)
args_buffer = []
if not show_empty:
if value == []:
field_type = cls._field_types.get(name, object)
if getattr(field_type, '__origin__', ...) is list:
if not keywords:
args_buffer.append(repr(value))
continue
if not keywords:
args.extend(args_buffer)
args_buffer = []
value, simple = _format(value, level)
allsimple = allsimple and simple
if keywords:
Expand Down
24 changes: 24 additions & 0 deletions Lib/test/test_ast/test_ast.py
Original file line number Diff line number Diff line change
Expand Up @@ -1543,18 +1543,42 @@ def check_text(code, empty, full, **kwargs):
full="MatchSingleton(value=None)",
)

check_node(
ast.MatchSingleton(value=[]),
empty="MatchSingleton(value=[])",
full="MatchSingleton(value=[])",
)

check_node(
ast.Constant(value=None),
empty="Constant(value=None)",
full="Constant(value=None)",
)

check_node(
ast.Constant(value=[]),
empty="Constant(value=[])",
full="Constant(value=[])",
)

check_node(
ast.Constant(value=''),
empty="Constant(value='')",
full="Constant(value='')",
)

check_node(
ast.Interpolation(value=ast.Constant(42), str=None, conversion=-1),
empty="Interpolation(value=Constant(value=42), str=None, conversion=-1)",
full="Interpolation(value=Constant(value=42), str=None, conversion=-1)",
)

check_node(
ast.Interpolation(value=ast.Constant(42), str=[], conversion=-1),
empty="Interpolation(value=Constant(value=42), str=[], conversion=-1)",
full="Interpolation(value=Constant(value=42), str=[], conversion=-1)",
)

check_text(
"def a(b: int = 0, *, c): ...",
empty="Module(body=[FunctionDef(name='a', args=arguments(args=[arg(arg='b', annotation=Name(id='int', ctx=Load()))], kwonlyargs=[arg(arg='c')], kw_defaults=[None], defaults=[Constant(value=0)]), body=[Expr(value=Constant(value=Ellipsis))])])",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:func:`ast.dump` now only omits ``None`` and ``[]`` values if they are
default values.
Loading