[Python3] Make update-checkout work with Python 2 & 3 #33081
Merged
Conversation
This file contains hidden or 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
Three issues addressed here: 1. Dependency on dictionary iteration order CharacterProperties.swift.gyb iterated a dictionary to produce its output. Changed this to a list of tuples to ensure the order is predictable. 2. Python3 `map` returns an iterator, not a list Changed a bunch of `map` calls to `list(map(...))` to ensure the result is a list 3. Python3 `int()` expects a string, won't accept a list of characters Added a concatenation step that is effectively a no-op on Python2
Python3 doesn't like to pickle local functions, so make the multiprocessing initialization function be global. Python3 multiprocessing also seems to require conditional execution of the top-level code. TBH, I'm not entirely sure why Python 2 didn't need this.
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
|
Build failed |
|
@swift-ci Please clean test macOS |
|
@swift-ci Please test Linux |
|
Build failed |
|
Build failed |
|
@swift-ci Please clean test macOS |
|
@swift-ci Python lint |
AnthonyLatsis
added
the
update-checkout
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.
As usual, Python 3 is less forgiving:
It will pickle global functions, but not local closures
Multiprocessing requires the top-level code to only run in the main process