diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-09-28 01:09:28 -0700 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2017-09-28 01:09:28 -0700 |
| commit | dd86461e045557d87a487d1edab9617f0ed4b58f (patch) | |
| tree | e57248236def7f2a9a4f84c44e04f88bc49d4290 /numpy/ma/core.py | |
| parent | 5289102a3bed26744fc694a819f4b25be85b3170 (diff) | |
| download | numpy-dd86461e045557d87a487d1edab9617f0ed4b58f.tar.gz | |
BUG: Don't ignore mismatching shapes just because the mask is all zeros
Fixes #4520
Diffstat (limited to 'numpy/ma/core.py')
| -rw-r--r-- | numpy/ma/core.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index be605f0a7..b6e2edf5a 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -1920,7 +1920,7 @@ def masked_where(condition, a, copy=True): """ # Make sure that condition is a valid standard-type mask. - cond = make_mask(condition) + cond = make_mask(condition, shrink=False) a = np.array(a, copy=copy, subok=True) (cshape, ashape) = (cond.shape, a.shape) @@ -1934,7 +1934,7 @@ def masked_where(condition, a, copy=True): cls = MaskedArray result = a.view(cls) # Assign to *.mask so that structured masks are handled correctly. - result.mask = cond + result.mask = _shrink_mask(cond) return result |