Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-124442: make __static_attributes__ deterministic by sorting #124492

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
merged 6 commits into from
Sep 28, 2024
Merged

gh-124442: make __static_attributes__ deterministic by sorting #124492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e097874
fix issue #124442: make `__static_attributes__` deterministic by sorting
kp2pml30 Sep 25, 2024
676ddad
fail if sort fails, add a test
kp2pml30 Sep 25, 2024
17d8e4c
patch docs
kp2pml30 Sep 27, 2024
c026422
Rewrite test and NEWS entry
JelleZijlstra Sep 28, 2024
b1e6bd5
Merge remote-tracking branch 'upstream/main' into fix-issue-124442
JelleZijlstra Sep 28, 2024
bb93cca
Update Lib/test/test_compile.py
JelleZijlstra Sep 28, 2024
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
17 changes: 17 additions & 0 deletions Lib/test/test_compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import contextlib
import dis
import io
import itertools
import math
import opcode
import os
Expand Down Expand Up @@ -2687,6 +2688,22 @@ def test_nested(self):
self.compare_instructions(seq, [('LOAD_CONST', 1, 1, 0, 0, 0)])
self.compare_instructions(seq.get_nested()[0], [('LOAD_CONST', 2, 2, 0, 0, 0)])

def test_static_attributes_are_sorted(self):
code = (
'class T:\n'
' def __init__(self):\n'
' self.{V1} = 10\n'
' self.{V2} = 10\n'
' def foo(self):\n'
' self.{V3} = 10\n'
)
attributes = ("a", "b", "c")
for perm in itertools.permutations(attributes):
var_names = {f'V{i + 1}': name for i, name in enumerate(perm)}
ns = run_code(code.format(**var_names))
t = ns['T']
self.assertEqual(t.__static_attributes__, attributes)


if __name__ == "__main__":
unittest.main()
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2024-09-25-11-53-22.gh-issue-124442.EXC1Ve.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix nondeterminism in compilation by sorting the value of
:attr:`~type.__static_attributes__`. Patch by kp2pml30.
12 changes: 11 additions & 1 deletion Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,17 @@ PyObject *
_PyCompile_StaticAttributesAsTuple(compiler *c)
{
assert(c->u->u_static_attributes);
return PySequence_Tuple(c->u->u_static_attributes);
PyObject *static_attributes_unsorted = PySequence_List(c->u->u_static_attributes);
if (static_attributes_unsorted == NULL) {
return NULL;
}
if (PyList_Sort(static_attributes_unsorted) != 0) {
Py_DECREF(static_attributes_unsorted);
return NULL;
}
PyObject *static_attributes = PySequence_Tuple(static_attributes_unsorted);
Py_DECREF(static_attributes_unsorted);
return static_attributes;
}

int
Expand Down
Loading