Cleanup some old python 2 idioms #2640
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
neutrinoceros
added
enhancement
neutrinoceros
changed the title
cphyc
approved these changes
Jun 17, 2020
neutrinoceros
force-pushed
the
cleanup_object_inheritance
branch
from
ee0561e
to
ff843f0
Compare
|
Oops. I used |
This was referenced Jun 17, 2020
munkm
approved these changes
Jun 22, 2020
| @@ -1,4 +1,4 @@ | |||
| from __future__ import print_function | |||
|
|
|||
There was a problem hiding this comment.
@cphyc were you mentioning empty lines at the start of files because you'd like them to be removed?
There was a problem hiding this comment.
good catch, fixing it right now
| @@ -13,8 +13,7 @@ def test_cartesian_coordinates(): | |||
| # We're going to load up a simple AMR grid and check its volume | |||
| # calculations and path length calculations. | |||
| ds = fake_amr_ds() | |||
| axes = list(set(ds.coordinates.axis_name.values())) | |||
| axes.sort() | |||
| axes = sorted(set(ds.coordinates.axis_name.values())) | |||
| else: | ||
| a.sort(axis=axis) | ||
| sorted = a | ||
| a_sorted = a |
There was a problem hiding this comment.
I like this clearer variable name
…and used builtin sorted function where relevant
Co-authored-by: Corentin Cadiou <contact@cphyc.me>
neutrinoceros
force-pushed
the
cleanup_object_inheritance
branch
from
4f89ee8
to
592a21e
Compare
|
@yt-fido test this please |
9 tasks
|
@yt-fido test this please |
matthewturk
approved these changes
Jun 26, 2020
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.
objectclass is implicit in python 3 so there's no need to keep enforcing it after we dropped support for python 2.The following were done semi-automatically through
2to3+ manual validation, since in many cases this tool will produce incorrect results (e.g. with sorting numpy arrays)long(->int) andunicode(->str)nextmethod instead of__next__, this change could break some downstream code if the deprecated syntaxself.next()was used (should be a niche case and is easily fixed)a = sorted(data)instead ofa=list(data); a.sort()where relevant (i.e. where it doesn't cause performance hits by adding a copy step)while Trueinstead ofwhile 1isinstance(a, mytype)instead oftype(a) is mytype. Within tests I conservatively assumed it's preferable to leave the more strict type comparison but replaced some==comparisons withis(I don't know if it's even possible to build case where they are not equivalent but the later is definetely correct).