Skip to content

ast: Populate _field_types with real type objects #6981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Feb 3, 2026
Merged

ast: Populate _field_types with real type objects #6981

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f70979
Populate _field_types with real type objects
youknowone Feb 3, 2026
b45cea5
Merge branch 'main' into ast
youknowone Feb 3, 2026
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
Next Next commit
Populate _field_types with real type objects 
- Add FieldType enum and FIELD_TYPES static table mapping all
  AST node classes to their ASDL field types
- Resolve markers to real Python type objects (GenericAlias,
  Union, plain types) at module init in populate_field_types()
- Set class-level None defaults for optional fields
- Replace hardcoded LIST_FIELDS and class-name checks in
  slot_init with _field_types-based lookup
- Add expr_context default to Load(), fix ImportFrom.level
  default (now None instead of 0)
- Fix __class_getitem__ None check, compile() formatting
- Remove 14 @expectedfailure decorators from test_ast
  • Loading branch information
@youknowone
youknowone committed Feb 3, 2026
commit 2f7097962b8c913b00ffb9bb9c95c45138ce2893
14 changes: 0 additions & 14 deletions Lib/test/test_ast/test_ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,7 +1480,6 @@ def test_parse_in_error(self):
ast.literal_eval(r"'\U'")
self.assertIsNotNone(e.exception.__context__)

@unittest.expectedFailure # TODO: RUSTPYTHON; + Module(body=[Expr(value=Call(func=Name(id='spam', ctx=Load()), args=[Name(id='eggs', ctx=Load()), Constant(value='and cheese')]))])
def test_dump(self):
node = ast.parse('spam(eggs, "and cheese")')
self.assertEqual(ast.dump(node),
Expand All @@ -1501,7 +1500,6 @@ def test_dump(self):
"lineno=1, col_offset=0, end_lineno=1, end_col_offset=24)])"
)

@unittest.expectedFailure # TODO: RUSTPYTHON; - type_ignores=[])
def test_dump_indent(self):
node = ast.parse('spam(eggs, "and cheese")')
self.assertEqual(ast.dump(node, indent=3), """\
Expand Down Expand Up @@ -1557,7 +1555,6 @@ def test_dump_indent(self):
end_lineno=1,
end_col_offset=24)])""")

@unittest.expectedFailure # TODO: RUSTPYTHON; + Raise()
def test_dump_incomplete(self):
node = ast.Raise(lineno=3, col_offset=4)
self.assertEqual(ast.dump(node),
Expand Down Expand Up @@ -1622,7 +1619,6 @@ def test_dump_incomplete(self):
"ClassDef('T', [], [keyword('a', Constant(None))], [], [Name('dataclass', Load())])",
)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_dump_show_empty(self):
def check_node(node, empty, full, **kwargs):
with self.subTest(show_empty=False):
Expand Down Expand Up @@ -1743,7 +1739,6 @@ def test_copy_location(self):
self.assertEqual(new.lineno, 1)
self.assertEqual(new.col_offset, 1)

@unittest.expectedFailure # TODO: RUSTPYTHON; + Module(body=[Expr(value=Call(func=Name(id='write', ctx=Load(), lineno=1, col_offset=0, end_lineno=1, end_col_offset=5), args=[Constant(value='spam', lineno=1, col_offset=6, end_lineno=1, end_col_offset=12)], lineno=1, col_offset=0, end_lineno=1, end_col_offset=13), lineno=1, col_offset=0, end_lineno=1, end_col_offset=13), Expr(value=Call(func=Name(id='spam', ctx=Load(), lineno=1, col_offset=0, end_lineno=1, end_col_offset=0), args=[Constant(value='eggs', lineno=1, col_offset=0, end_lineno=1, end_col_offset=0)], lineno=1, col_offset=0, end_lineno=1, end_col_offset=0), lineno=1, col_offset=0, end_lineno=1, end_col_offset=0)])
def test_fix_missing_locations(self):
src = ast.parse('write("spam")')
src.body.append(ast.Expr(ast.Call(ast.Name('spam', ast.Load()),
Expand Down Expand Up @@ -1807,7 +1802,6 @@ def test_iter_fields(self):
self.assertEqual(d.pop('func').id, 'foo')
self.assertEqual(d, {'keywords': [], 'args': []})

@unittest.expectedFailure # TODO: RUSTPYTHON; + keyword(arg='eggs', value=Constant(value='leek'))
def test_iter_child_nodes(self):
node = ast.parse("spam(23, 42, eggs='leek')", mode='eval')
self.assertEqual(len(list(ast.iter_child_nodes(node.body))), 4)
Expand Down Expand Up @@ -3149,7 +3143,6 @@ def assertASTTransformation(self, transformer_class,

self.assertASTEqual(result_ast, expected_ast)

@unittest.expectedFailure # TODO: RUSTPYTHON; <class 'object'> is not <class 'NoneType'>
def test_node_remove_single(self):
code = 'def func(arg) -> SomeType: ...'
expected = 'def func(arg): ...'
Expand Down Expand Up @@ -3376,7 +3369,6 @@ class BadFields(ast.AST):
with self.assertWarnsRegex(DeprecationWarning, r"Field b'\\xff\\xff.*' .*"):
obj = BadFields()

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: None != []
def test_complete_field_types(self):
class _AllFieldTypes(ast.AST):
_fields = ('a', 'b')
Expand Down Expand Up @@ -3569,7 +3561,6 @@ def test_single_mode_flag(self):
with self.subTest(flag=flag):
self.check_output(source, expect, flag)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_eval_mode_flag(self):
# test 'python -m ast -m/--mode eval'
source = 'print(1, 2, 3)'
Expand Down Expand Up @@ -3604,7 +3595,6 @@ def test_func_type_mode_flag(self):
with self.subTest(flag=flag):
self.check_output(source, expect, flag)

@unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: type object '_ast.Module' has no attribute '_field_types'
def test_no_type_comments_flag(self):
# test 'python -m ast --no-type-comments'
source = 'x: bool = 1 # type: ignore[assignment]'
Expand All @@ -3619,7 +3609,6 @@ def test_no_type_comments_flag(self):
'''
self.check_output(source, expect, '--no-type-comments')

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_include_attributes_flag(self):
# test 'python -m ast -a/--include-attributes'
source = 'pass'
Expand All @@ -3636,7 +3625,6 @@ def test_include_attributes_flag(self):
with self.subTest(flag=flag):
self.check_output(source, expect, flag)

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_indent_flag(self):
# test 'python -m ast -i/--indent 0'
source = 'pass'
Expand Down Expand Up @@ -3673,7 +3661,6 @@ def test_feature_version_flag(self):
with self.assertRaises(SyntaxError):
self.invoke_ast('--feature-version=3.9')

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_no_optimize_flag(self):
# test 'python -m ast -O/--optimize -1/0'
source = '''
Expand Down Expand Up @@ -3724,7 +3711,6 @@ def test_optimize_flag(self):
with self.subTest(flag=flag):
self.check_output(source, expect, flag)

@unittest.expectedFailure # TODO: RUSTPYTHON; type_ignores=[])
def test_show_empty_flag(self):
# test 'python -m ast --show-empty'
source = 'print(1, 2, 3)'
Expand Down
Loading
Loading