diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-01-13 12:00:18 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-01-13 12:00:18 -0500 |
| commit | 615bcd163d1c557b88c5f8a7d50128e3cccfd5a6 (patch) | |
| tree | 1aa423f77c7349379589be9a1ced3258dc03eb62 /numpy/ma/extras.py | |
| parent | ad238c1c3d5c136a61e795fc056373e0a1cbd8e1 (diff) | |
| parent | b82230fdb438ba368e18ad8d3c55cb4779ab2acf (diff) | |
| download | numpy-615bcd163d1c557b88c5f8a7d50128e3cccfd5a6.tar.gz | |
Merge pull request #5447 from juliantaylor/ma-median-ndarray
BUG: fix ma.median used on ndarrays
Diffstat (limited to 'numpy/ma/extras.py')
| -rw-r--r-- | numpy/ma/extras.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index 726be6cb6..9adb9d368 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -41,7 +41,7 @@ import warnings from . import core as ma from .core import MaskedArray, MAError, add, array, asarray, concatenate, count, \ filled, getmask, getmaskarray, make_mask_descr, masked, masked_array, \ - mask_or, nomask, ones, sort, zeros + mask_or, nomask, ones, sort, zeros, getdata #from core import * import numpy as np @@ -671,7 +671,7 @@ def median(a, axis=None, out=None, overwrite_input=False): """ if not hasattr(a, 'mask') or np.count_nonzero(a.mask) == 0: - return masked_array(np.median(getattr(a, 'data', a), axis=axis, + return masked_array(np.median(getdata(a, subok=True), axis=axis, out=out, overwrite_input=overwrite_input), copy=False) if overwrite_input: if axis is None: |