mirror of https://github.com/python/cpython
[3.13] gh-121332: Make AST node constructor check _attributes instead of hardcoding attributes (GH-121334) (#121625)
(cherry picked from commit 58e8cf2bb6
)
This commit is contained in:
parent
3b5f8d256c
commit
38c4028dd9
|
@ -3148,6 +3148,18 @@ class ASTConstructorTests(unittest.TestCase):
|
|||
obj = FieldsAndTypes(a=1)
|
||||
self.assertEqual(obj.a, 1)
|
||||
|
||||
def test_custom_attributes(self):
|
||||
class MyAttrs(ast.AST):
|
||||
_attributes = ("a", "b")
|
||||
|
||||
obj = MyAttrs(a=1, b=2)
|
||||
self.assertEqual(obj.a, 1)
|
||||
self.assertEqual(obj.b, 2)
|
||||
|
||||
with self.assertWarnsRegex(DeprecationWarning,
|
||||
r"MyAttrs.__init__ got an unexpected keyword argument 'c'."):
|
||||
obj = MyAttrs(c=3)
|
||||
|
||||
def test_fields_and_types_no_default(self):
|
||||
class FieldsAndTypesNoDefault(ast.AST):
|
||||
_fields = ('a',)
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
Fix constructor of :mod:`ast` nodes with custom ``_attributes``. Previously,
|
||||
passing custom attributes would raise a :py:exc:`DeprecationWarning`. Passing
|
||||
arguments to the constructor that are not in ``_fields`` or ``_attributes``
|
||||
remains deprecated. Patch by Jelle Zijlstra.
|
|
@ -880,7 +880,7 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
|
|||
|
||||
Py_ssize_t i, numfields = 0;
|
||||
int res = -1;
|
||||
PyObject *key, *value, *fields, *remaining_fields = NULL;
|
||||
PyObject *key, *value, *fields, *attributes = NULL, *remaining_fields = NULL;
|
||||
if (PyObject_GetOptionalAttr((PyObject*)Py_TYPE(self), state->_fields, &fields) < 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
|
@ -947,22 +947,32 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
|
|||
goto cleanup;
|
||||
}
|
||||
}
|
||||
else if (
|
||||
PyUnicode_CompareWithASCIIString(key, "lineno") != 0 &&
|
||||
PyUnicode_CompareWithASCIIString(key, "col_offset") != 0 &&
|
||||
PyUnicode_CompareWithASCIIString(key, "end_lineno") != 0 &&
|
||||
PyUnicode_CompareWithASCIIString(key, "end_col_offset") != 0
|
||||
) {
|
||||
if (PyErr_WarnFormat(
|
||||
PyExc_DeprecationWarning, 1,
|
||||
"%.400s.__init__ got an unexpected keyword argument '%U'. "
|
||||
"Support for arbitrary keyword arguments is deprecated "
|
||||
"and will be removed in Python 3.15.",
|
||||
Py_TYPE(self)->tp_name, key
|
||||
) < 0) {
|
||||
else {
|
||||
// Lazily initialize "attributes"
|
||||
if (attributes == NULL) {
|
||||
attributes = PyObject_GetAttr((PyObject*)Py_TYPE(self), state->_attributes);
|
||||
if (attributes == NULL) {
|
||||
res = -1;
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
int contains = PySequence_Contains(attributes, key);
|
||||
if (contains == -1) {
|
||||
res = -1;
|
||||
goto cleanup;
|
||||
}
|
||||
else if (contains == 0) {
|
||||
if (PyErr_WarnFormat(
|
||||
PyExc_DeprecationWarning, 1,
|
||||
"%.400s.__init__ got an unexpected keyword argument '%U'. "
|
||||
"Support for arbitrary keyword arguments is deprecated "
|
||||
"and will be removed in Python 3.15.",
|
||||
Py_TYPE(self)->tp_name, key
|
||||
) < 0) {
|
||||
res = -1;
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
}
|
||||
res = PyObject_SetAttr(self, key, value);
|
||||
if (res < 0) {
|
||||
|
@ -1045,6 +1055,7 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
|
|||
Py_DECREF(field_types);
|
||||
}
|
||||
cleanup:
|
||||
Py_XDECREF(attributes);
|
||||
Py_XDECREF(fields);
|
||||
Py_XDECREF(remaining_fields);
|
||||
return res;
|
||||
|
|
|
@ -5079,7 +5079,7 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
|
|||
|
||||
Py_ssize_t i, numfields = 0;
|
||||
int res = -1;
|
||||
PyObject *key, *value, *fields, *remaining_fields = NULL;
|
||||
PyObject *key, *value, *fields, *attributes = NULL, *remaining_fields = NULL;
|
||||
if (PyObject_GetOptionalAttr((PyObject*)Py_TYPE(self), state->_fields, &fields) < 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
|
@ -5146,22 +5146,32 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
|
|||
goto cleanup;
|
||||
}
|
||||
}
|
||||
else if (
|
||||
PyUnicode_CompareWithASCIIString(key, "lineno") != 0 &&
|
||||
PyUnicode_CompareWithASCIIString(key, "col_offset") != 0 &&
|
||||
PyUnicode_CompareWithASCIIString(key, "end_lineno") != 0 &&
|
||||
PyUnicode_CompareWithASCIIString(key, "end_col_offset") != 0
|
||||
) {
|
||||
if (PyErr_WarnFormat(
|
||||
PyExc_DeprecationWarning, 1,
|
||||
"%.400s.__init__ got an unexpected keyword argument '%U'. "
|
||||
"Support for arbitrary keyword arguments is deprecated "
|
||||
"and will be removed in Python 3.15.",
|
||||
Py_TYPE(self)->tp_name, key
|
||||
) < 0) {
|
||||
else {
|
||||
// Lazily initialize "attributes"
|
||||
if (attributes == NULL) {
|
||||
attributes = PyObject_GetAttr((PyObject*)Py_TYPE(self), state->_attributes);
|
||||
if (attributes == NULL) {
|
||||
res = -1;
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
int contains = PySequence_Contains(attributes, key);
|
||||
if (contains == -1) {
|
||||
res = -1;
|
||||
goto cleanup;
|
||||
}
|
||||
else if (contains == 0) {
|
||||
if (PyErr_WarnFormat(
|
||||
PyExc_DeprecationWarning, 1,
|
||||
"%.400s.__init__ got an unexpected keyword argument '%U'. "
|
||||
"Support for arbitrary keyword arguments is deprecated "
|
||||
"and will be removed in Python 3.15.",
|
||||
Py_TYPE(self)->tp_name, key
|
||||
) < 0) {
|
||||
res = -1;
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
}
|
||||
res = PyObject_SetAttr(self, key, value);
|
||||
if (res < 0) {
|
||||
|
@ -5244,6 +5254,7 @@ ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
|
|||
Py_DECREF(field_types);
|
||||
}
|
||||
cleanup:
|
||||
Py_XDECREF(attributes);
|
||||
Py_XDECREF(fields);
|
||||
Py_XDECREF(remaining_fields);
|
||||
return res;
|
||||
|
|
Loading…
Reference in New Issue