Skip to content

gh-135797 Add default empty dict for ast._field_types attribute. #135800

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

Closed
wants to merge 2 commits into from
Closed

gh-135797 Add default empty dict for ast._field_types attribute. #135800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d9e74a
Add _field_types attribute to AST class.
hunterhogan Jun 21, 2025
e3bfe0f
As requested, reverting Ruff E703: Statement ends with an unnecessary…
hunterhogan Jun 21, 2025
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
1 change: 1 addition & 0 deletions Include/internal/pycore_ast_state.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2025-06-21-16-28-06.gh-issue-135797.HXKtbB.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add the _field_types attribute to the base AST class and its subclasses. The
default value is an empty dict. Patch by Hunter Hogan.
20 changes: 18 additions & 2 deletions Parser/asdl_c.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,6 +1734,17 @@ def visitModule(self, mod):
state->__module__,
state->ast,
state->__doc__, doc);
if (result) {
PyObject *empty_dict = PyDict_New();
if (!empty_dict ||
PyObject_SetAttr(result, state->_field_types, empty_dict) < 0) {
Py_XDECREF(empty_dict);
Py_DECREF(result);
Py_DECREF(fnames);
return NULL;
}
Py_DECREF(empty_dict);
}
Py_DECREF(fnames);
return result;
}
Expand Down Expand Up @@ -1860,16 +1871,20 @@ def visitModule(self, mod):

static int add_ast_fields(struct ast_state *state)
{
PyObject *empty_tuple;
PyObject *empty_tuple, *empty_dict;
empty_tuple = PyTuple_New(0);
if (!empty_tuple ||
empty_dict = PyDict_New();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is technically unsafe: if PyTuple_New raised an exception, we can't generally call other C API functions with an exception set. Safer to have a separate if statement for the dict.

if (!empty_tuple || !empty_dict ||
PyObject_SetAttrString(state->AST_type, "_fields", empty_tuple) < 0 ||
PyObject_SetAttrString(state->AST_type, "_field_types", empty_dict) < 0 ||
PyObject_SetAttrString(state->AST_type, "__match_args__", empty_tuple) < 0 ||
PyObject_SetAttrString(state->AST_type, "_attributes", empty_tuple) < 0) {
Py_XDECREF(empty_tuple);
Py_XDECREF(empty_dict);
return -1;
}
Py_DECREF(empty_tuple);
Py_DECREF(empty_dict);
return 0;
}

Expand Down Expand Up @@ -2272,6 +2287,7 @@ def generate_module_def(mod, metadata, f, internal_h):
state_strings = {
"ast",
"_fields",
"_field_types",
"__match_args__",
"__doc__",
"__dict__",
Expand Down
21 changes: 19 additions & 2 deletions Python/Python-ast.c
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading