Skip to content

bpo-43850: write sets reproducibly in marshalled code #25411

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
FFY00 wants to merge 3 commits into from
Closed

bpo-43850: write sets reproducibly in marshalled code #25411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9405610
bpo-43850: write sets reproducibly in marshalled code
FFY00 Apr 14, 2021
5e714eb
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 14, 2021
ce93d50
Apply suggestions from code review
FFY00 Apr 14, 2021
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 Misc/NEWS.d/next/Core and Builtins/2021-04-14-22-36-31.bpo-43850.hi1RaZ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Write sets and frozensets reproducibly in marshalled code. This makes Python bytecode not depend on the random seed.
8 changes: 5 additions & 3 deletions Python/marshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ w_complex_object(PyObject *v, char flag, WFILE *p)
w_object((PyObject *)NULL, p);
}
else if (PyAnySet_CheckExact(v)) {
PyObject *value;
PyObject *ordered_list, *value;
Py_ssize_t pos = 0;
Py_hash_t hash;

Expand All @@ -502,8 +502,10 @@ w_complex_object(PyObject *v, char flag, WFILE *p)
W_TYPE(TYPE_SET, p);
n = PySet_GET_SIZE(v);
W_SIZE(n, p);
while (_PySet_NextEntry(v, &pos, &value, &hash)) {
w_object(value, p);
ordered_list = PySequence_List(v);
PyList_Sort(ordered_list);
for (i = 0; i < n; i++) {
w_object(PyList_GET_ITEM(ordered_list, i), p);
}
}
else if (PyCode_Check(v)) {
Expand Down