Consistent check for masked array types #2434
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
|
Ping @pp-mo |
|
Tests pass! Anyone want to take a look? |
lbdreyer
reviewed
Mar 14, 2017
| @@ -2221,7 +2221,7 @@ def new_cell_measure_dims(cm_): | |||
| data = copy.deepcopy(data) | |||
|
|
|||
| # We can turn a masked array into a normal array if it's full. | |||
| if isinstance(data, ma.core.MaskedArray): | |||
There was a problem hiding this comment.
ma.core.MaskedArray!! there are quite a few different ways this has been accessed.
There was a problem hiding this comment.
Oh our dear old friend lack of consistency...
Dammit PyCharm! Your search has let me down... |
But then again, perhaps we should blame my ability to regex. |
|
@dkillick Awesome, but I think that you're still missing a couple of |
|
@dkillick Let's get this merged ... |
./fileformats/grib/_load_convert.py
1384: if isinstance(data, ma.core.MaskedArray):
./fileformats/pp.py
100: if isinstance(data, np.ma.core.MaskedArray):
./experimental/raster.py
934: if not isinstance(a, (np.ndarray, ma.core.MaskedArray)):
./util.pyand These are the obvious candidates ... fix those and I'll merge. |
8addb90
to
3b2c05d
Compare
|
@bjlittle I've removed a few more examples... |
3b2c05d
to
517f4bc
Compare
517f4bc
to
e982db9
Compare
bjlittle
pushed a commit
to bjlittle/iris
that referenced
this pull request
May 31, 2017
* Consistent checking for ma * License headers * Fix missed instances
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.
Consistency! And using part of an API for what it was meant for (in this case checking that an object is of a certain type).
To wit, anything that looks like the former will now look like the latter:
if isinstance(thing, ma.core.MaskedArray)-->if ma.isMaskedArray(thing)if thing is ma.masked-->if ma.is_masked(thing)