diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2020-12-11 14:38:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 14:38:53 -0700 |
| commit | f1e479659566ab798bec511c97d32b0ab8b645c9 (patch) | |
| tree | 7876929a359f9b06017c81ede2c725248397edab /numpy/ma | |
| parent | cfb6a4d88d88307d507a86d1d70cd7d84c611406 (diff) | |
| parent | 03181afa5f57c85a8607d59afaaa5370b127fb1a (diff) | |
| download | numpy-f1e479659566ab798bec511c97d32b0ab8b645c9.tar.gz | |
Merge pull request #17955 from Carreau/fix-17944
DOC: Replace {var} in docstrings type annotation with `scalar or None`.
Diffstat (limited to 'numpy/ma')
| -rw-r--r-- | numpy/ma/core.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index 4fb7d8c28..d6af22337 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -5439,7 +5439,7 @@ class MaskedArray(ndarray): When the array contains unmasked values at the same extremes of the datatype, the ordering of these values and the masked values is undefined. - fill_value : {var}, optional + fill_value : scalar or None, optional Value used internally for the masked values. If ``fill_value`` is not None, it supersedes ``endwith``. @@ -5497,7 +5497,7 @@ class MaskedArray(ndarray): axis : {None, integer} If None, the index is into the flattened array, otherwise along the specified axis - fill_value : {var}, optional + fill_value : scalar or None, optional Value used to fill in the masked values. If None, the output of minimum_fill_value(self._data) is used instead. out : {None, array}, optional @@ -5543,7 +5543,7 @@ class MaskedArray(ndarray): axis : {None, integer} If None, the index is into the flattened array, otherwise along the specified axis - fill_value : {var}, optional + fill_value : scalar or None, optional Value used to fill in the masked values. If None, the output of maximum_fill_value(self._data) is used instead. out : {None, array}, optional @@ -5594,7 +5594,7 @@ class MaskedArray(ndarray): When the array contains unmasked values sorting at the same extremes of the datatype, the ordering of these values and the masked values is undefined. - fill_value : {var}, optional + fill_value : scalar or None, optional Value used internally for the masked values. If ``fill_value`` is not None, it supersedes ``endwith``. @@ -5665,7 +5665,7 @@ class MaskedArray(ndarray): out : array_like, optional Alternative output array in which to place the result. Must be of the same shape and buffer length as the expected output. - fill_value : {var}, optional + fill_value : scalar or None, optional Value used to fill in the masked values. If None, use the output of `minimum_fill_value`. keepdims : bool, optional @@ -5799,7 +5799,7 @@ class MaskedArray(ndarray): out : array_like, optional Alternative output array in which to place the result. Must be of the same shape and buffer length as the expected output. - fill_value : {var}, optional + fill_value : scalar or None, optional Value used to fill in the masked values. If None, use the output of maximum_fill_value(). keepdims : bool, optional @@ -5876,7 +5876,7 @@ class MaskedArray(ndarray): Alternative output array in which to place the result. It must have the same shape and buffer length as the expected output but the type will be cast if necessary. - fill_value : {var}, optional + fill_value : scalar or None, optional Value used to fill in the masked values. keepdims : bool, optional If this is set to True, the axes which are reduced are left |