mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.13] gh-122445: populate only modified fields in __static_attributes__ (#122446) (#122621)

Browse source 
gh-122445: populate only modified fields in __static_attributes__ (#122446)

(cherry picked from commit 498376d7a7)
This commit is contained in:
Irit Katriel 2024-08-02 19:26:57 +01:00 • committed by GitHub
parent b20893b5c2
commit 545a328eae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/reference/datamodel.rst
View file

@ -996,7 +996,7 @@ Special attributes:
a :ref:`generic class <generic-classes>`.
:attr:`~class.__static_attributes__`
A tuple containing names of attributes of this class which are accessed
A tuple containing names of attributes of this class which are assigned
through ``self.X`` from any function in its body.
:attr:`__firstlineno__`

2
Doc/whatsnew/3.13.rst
View file

@ -247,7 +247,7 @@ Improved Error Messages
TypeError: split() got an unexpected keyword argument 'max_split'. Did you mean 'maxsplit'?
* Classes have a new :attr:`~class.__static_attributes__` attribute, populated by the compiler,
with a tuple of names of attributes of this class which are accessed
with a tuple of names of attributes of this class which are assigned
through ``self.X`` from any function in its body. (Contributed by Irit Katriel
in :gh:`115775`.)

5
Lib/test/test_compile.py
View file

@ -2056,12 +2056,15 @@ class TestSourcePositions(unittest.TestCase):
self.assertLessEqual(end_col, code_end)
class TestExpectedAttributes(unittest.TestCase):
class TestStaticAttributes(unittest.TestCase):
def test_basic(self):
class C:
def f(self):
self.a = self.b = 42
# read fields are not included
self.f()
self.arr[3]
self.assertIsInstance(C.__static_attributes__, tuple)
self.assertEqual(sorted(C.__static_attributes__), ['a', 'b'])

1
Misc/NEWS.d/next/Core and Builtins/2024-07-30-11-41-35.gh-issue-122445.Rq0bjS.rst Normal file
View file

@ -0,0 +1 @@
Add only fields which are modified via self.* to :attr:`~class.__static_attributes__`.

30
Python/compile.c
View file

@ -589,9 +589,17 @@ compiler_unit_free(struct compiler_unit *u)
PyMem_Free(u);
}
static struct compiler_unit *
get_class_compiler_unit(struct compiler *c)
static int
compiler_maybe_add_static_attribute_to_class(struct compiler *c, expr_ty e)
{
assert(e->kind == Attribute_kind);
expr_ty attr_value = e->v.Attribute.value;
if (attr_value->kind != Name_kind ||
e->v.Attribute.ctx != Store ||
!_PyUnicode_EqualToASCIIString(attr_value->v.Name.id, "self"))
{
return SUCCESS;
}
Py_ssize_t stack_size = PyList_GET_SIZE(c->c_stack);
for (Py_ssize_t i = stack_size - 1; i >= 0; i--) {
PyObject *capsule = PyList_GET_ITEM(c->c_stack, i);
@ -599,10 +607,12 @@ get_class_compiler_unit(struct compiler *c)
capsule, CAPSULE_NAME);
assert(u);
if (u->u_scope_type == COMPILER_SCOPE_CLASS) {
return u;
assert(u->u_static_attributes);
RETURN_IF_ERROR(PySet_Add(u->u_static_attributes, e->v.Attribute.attr));
break;
}
}
return NULL;
return SUCCESS;
}
static int
@ -6283,17 +6293,7 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
ADDOP(c, loc, NOP);
return SUCCESS;
}
if (e->v.Attribute.value->kind == Name_kind &&
_PyUnicode_EqualToASCIIString(e->v.Attribute.value->v.Name.id, "self"))
{
struct compiler_unit *class_u = get_class_compiler_unit(c);
if (class_u != NULL) {
assert(class_u->u_scope_type == COMPILER_SCOPE_CLASS);
assert(class_u->u_static_attributes);
RETURN_IF_ERROR(
PySet_Add(class_u->u_static_attributes, e->v.Attribute.attr));
}
}
RETURN_IF_ERROR(compiler_maybe_add_static_attribute_to_class(c, e));
VISIT(c, expr, e->v.Attribute.value);
loc = LOC(e);
loc = update_start_location_to_match_attr(c, loc, e);