fix: ensure fuse order is read in a stable way #29599
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarshallOfSound
added
fast-track 🚅
electron-cation
bot
added
new-pr 🌱
nornagon
reviewed
Jun 9, 2021
| @@ -50,7 +51,7 @@ | |||
| """ | |||
|
|
|||
| with open(os.path.join(dir_path, "fuses.json5"), 'r') as f: | |||
| fuse_defaults = json.loads(''.join(line for line in f.readlines() if not line.strip()[0] == "/")) | |||
| fuse_defaults = json.loads(''.join(line for line in f.readlines() if not line.strip()[0] == "/"), object_pairs_hook=OrderedDict) | |||
There was a problem hiding this comment.
This will sort the keys alphabetically, right? Is that what we want?
There was a problem hiding this comment.
No, this will keep keys in the order in which they are added.
dict subclass that remembers the order entries were added
And the JSON loader adds them in order of appearance.
codebytere
approved these changes
Jun 9, 2021
|
Release Notes Persisted
|
This was referenced Jun 9, 2021
|
I have automatically backported this PR to "13-x-y", please check out #29615 |
|
I have automatically backported this PR to "14-x-y", please check out #29616 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
python2 and python3 have subtley different behavior when getting
keys()from a JSON parsed dictionary. Forcing the dictionary to be anOrderedDictensures the behavior is consistent (and what we have documented).Notes: Electron Fuses are now in a consistent order across platforms