diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-03-26 11:30:23 +0100 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2017-03-28 22:23:14 +0100 |
| commit | 17466ad1839718c091c629bb647e881b7922a148 (patch) | |
| tree | 05335c2935024943fe6913f7d0982603b17de4e6 /numpy/ma | |
| parent | e3ed705e5d91b584e9191a20f3a4780d354271ff (diff) | |
| download | numpy-17466ad1839718c091c629bb647e881b7922a148.tar.gz | |
MAINT: Rename _validate_axis, and document it
Diffstat (limited to 'numpy/ma')
| -rw-r--r-- | numpy/ma/core.py | 4 | ||||
| -rw-r--r-- | numpy/ma/extras.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index 6bc1bc623..6b1ea7806 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -43,7 +43,7 @@ from numpy.compat import ( ) from numpy import expand_dims as n_expand_dims from numpy.core.multiarray import normalize_axis_index -from numpy.core.numeric import _validate_axis +from numpy.core.numeric import normalize_axis_tuple if sys.version_info[0] >= 3: @@ -4370,7 +4370,7 @@ class MaskedArray(ndarray): return np.array(self.size, dtype=np.intp, ndmin=self.ndim) return self.size - axes = _validate_axis(axis, self.ndim) + axes = normalize_axis_tuple(axis, self.ndim) items = 1 for ax in axes: items *= self.shape[ax] diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index 8b37df902..4955d25eb 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -37,7 +37,7 @@ import numpy as np from numpy import ndarray, array as nxarray import numpy.core.umath as umath from numpy.core.multiarray import normalize_axis_index -from numpy.core.numeric import _validate_axis +from numpy.core.numeric import normalize_axis_tuple from numpy.lib.function_base import _ureduce from numpy.lib.index_tricks import AxisConcatenator @@ -820,7 +820,7 @@ def compress_nd(x, axis=None): if axis is None: axis = tuple(range(x.ndim)) else: - axis = _validate_axis(axis, x.ndim) + axis = normalize_axis_tuple(axis, x.ndim) # Nothing is masked: return x if m is nomask or not m.any(): |