2to3: apply dict fixer.
#3205
Merged
2to3: apply dict fixer.
#3205
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
In Python3 `dict.items()`, `dict.keys()`, and `dict.values()` are iterators. This causes problems when a list is needed so the 2to3 fixer explicitly constructs a list when is finds on of those functions. However, that is usually not necessary, so a lot of the work here has been cleaning up those places where the fix is not needed. The big exception to that is the `numpy/f2py/crackfortran.py` file. The code there makes extensive use of loops that modify the contents of the dictionary being looped through, which raises an error. That together with the obscurity of the code in that file made it safest to let the `dict` fixer do its worst. Closes numpy#3050.
| @@ -332,7 +332,7 @@ def _index_fields(ary, fields): | |||
| 'O': 'O', | |||
| 'x': 'V', # padding | |||
| } | |||
| _pep3118_native_typechars = ''.join(_pep3118_native_map.keys()) | |||
| _pep3118_native_typechars = ''.join(list(_pep3118_native_map.keys())) | |||
|
The rest look right to me. |
Most of these are places where an iterator will work as well as a list, but two fix places where `iterkeys` was introduced which is a bug.
|
Thanks for the review, the PR needed it. |
|
In the light of a new day, it also looks good to me. I'm going to put it in. |
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.
In Python3
dict.items(),dict.keys(), anddict.values()areiterators. This causes problems when a list is needed so the 2to3 fixer
explicitly constructs a list when is finds on of those functions.
However, that is usually not necessary, so a lot of the work here has
been cleaning up those places where the fix is not needed. The big
exception to that is the
numpy/f2py/crackfortran.pyfile. The codethere makes extensive use of loops that modify the contents of the
dictionary being looped through, which raises an error. That together
with the obscurity of the code in that file made it safest to let the
dictfixer do its worst.Closes #3050.