diff options
Diffstat (limited to 'numpy/ma')
| -rw-r--r-- | numpy/ma/core.py | 6 | ||||
| -rw-r--r-- | numpy/ma/extras.py | 8 | ||||
| -rw-r--r-- | numpy/ma/tests/test_core.py | 2 | ||||
| -rw-r--r-- | numpy/ma/tests/test_deprecations.py | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index bccb0bce1..d6b30ae2e 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -1954,7 +1954,7 @@ def masked_where(condition, a, copy=True): (cshape, ashape) = (cond.shape, a.shape) if cshape and cshape != ashape: - raise IndexError("Inconsistant shape between the condition and the input" + raise IndexError("Inconsistent shape between the condition and the input" " (got %s and %s)" % (cshape, ashape)) if hasattr(a, '_mask'): cond = mask_or(cond, a._mask) @@ -4655,7 +4655,7 @@ class MaskedArray(ndarray): self._data.put(indices, values, mode=mode) - # short circut if neither self nor values are masked + # short circuit if neither self nor values are masked if self._mask is nomask and getmask(values) is nomask: return @@ -5889,7 +5889,7 @@ class MaskedArray(ndarray): Parameters ---------- fill_value : scalar, optional - Value used to fill in the masked values. Deafult is None, in which + Value used to fill in the masked values. Default is None, in which case `MaskedArray.fill_value` is used. order : {'C','F','A'}, optional Order of the data item in the copy. Default is 'C'. diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index d55e0d1ea..d8ea3de8c 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -794,7 +794,7 @@ def _median(a, axis=None, out=None, overwrite_input=False): def compress_nd(x, axis=None): - """Supress slices from multiple dimensions which contain masked values. + """Suppress slices from multiple dimensions which contain masked values. Parameters ---------- @@ -803,10 +803,10 @@ def compress_nd(x, axis=None): elements are masked, `x` is interpreted as a MaskedArray with `mask` set to `nomask`. axis : tuple of ints or int, optional - Which dimensions to supress slices from can be configured with this + Which dimensions to suppress slices from can be configured with this parameter. - - If axis is a tuple of ints, those are the axes to supress slices from. - - If axis is an int, then that is the only axis to supress slices from. + - If axis is a tuple of ints, those are the axes to suppress slices from. + - If axis is an int, then that is the only axis to suppress slices from. - If axis is None, all axis are selected. Returns diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py index d37a561c2..c2b8d1403 100644 --- a/numpy/ma/tests/test_core.py +++ b/numpy/ma/tests/test_core.py @@ -4559,7 +4559,7 @@ class TestMaskedView(TestCase): class TestOptionalArgs(TestCase): def test_ndarrayfuncs(self): - # test axis arg behaves the same as ndarray (including mutliple axes) + # test axis arg behaves the same as ndarray (including multiple axes) d = np.arange(24.0).reshape((2,3,4)) m = np.zeros(24, dtype=bool).reshape((2,3,4)) diff --git a/numpy/ma/tests/test_deprecations.py b/numpy/ma/tests/test_deprecations.py index 8eea42fae..24dd7cb8d 100644 --- a/numpy/ma/tests/test_deprecations.py +++ b/numpy/ma/tests/test_deprecations.py @@ -23,7 +23,7 @@ class TestArgsort(TestCase): np.ma.core.MaskedArrayFutureWarning, argsort, arr_2d) assert_equal(result, argsort(arr_2d, axis=None)) - # should be no warnings for explictly specifiying it + # should be no warnings for explicitly specifying it argsort(arr_2d, axis=None) argsort(arr_2d, axis=-1) |