fix some python3 incompatibilities #46044
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
kennytm
approved these changes
Nov 16, 2017
src/libstd_unicode/unicode.py
Outdated
|
|
||
| canon_comp = {} | ||
| comp_exclusions = norm_props["Full_Composition_Exclusion"] | ||
| for char in canon_keys: | ||
| if True in map(lambda (lo, hi): lo <= char <= hi, comp_exclusions): | ||
| if True in map(lambda lo_hi: lo_hi[0] <= char <= lo_hi[1], comp_exclusions): |
There was a problem hiding this comment.
Maybe refactor this to?
if any(lo <= char <= hi for lo, hi in comp_exclusions):
continue
src/libstd_unicode/unicode.py
Outdated
| @@ -446,14 +446,14 @@ def emit_bool_trie(f, name, t_data, is_pub=True): | |||
| f.write(" };\n\n") | |||
|
|
|||
| def emit_small_bool_trie(f, name, t_data, is_pub=True): | |||
| last_chunk = max(int(hi / 64) for (lo, hi) in t_data) | |||
| last_chunk = max(int(hi // 64) for (lo, hi) in t_data) | |||
There was a problem hiding this comment.
Will we ever get non-integer from the source code? All the int() calls could be dropped in not.
kennytm
added
the
S-waiting-on-review
|
Hah. Good points. Fixed both. |
|
Thanks! @bors r+ rollup |
|
📌 Commit 261d4d8 has been approved by |
kennytm
added
S-waiting-on-bors
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Nov 18, 2017
fix some python3 incompatibilities
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.
No description provided.