diff options
| -rw-r--r-- | numpy/core/code_generators/ufunc_docstrings.py | 8 | ||||
| -rw-r--r-- | numpy/core/defchararray.py | 12 | ||||
| -rw-r--r-- | numpy/core/fromnumeric.py | 2 | ||||
| -rw-r--r-- | numpy/lib/arraypad.py | 10 | ||||
| -rw-r--r-- | numpy/lib/polynomial.py | 4 |
5 files changed, 18 insertions, 18 deletions
diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py index 1cd486608..ce9979d12 100644 --- a/numpy/core/code_generators/ufunc_docstrings.py +++ b/numpy/core/code_generators/ufunc_docstrings.py @@ -999,7 +999,7 @@ add_newdoc('numpy.core.umath', 'equal', Returns ------- - out : {ndarray, bool} + out : ndarray or bool Output array of bools, or a single bool if x1 and x2 are scalars. See Also @@ -1632,7 +1632,7 @@ add_newdoc('numpy.core.umath', 'isnan', Returns ------- - y : {ndarray, bool} + y : ndarray or bool For scalar input, the result is a new boolean with value True if the input is NaN; otherwise the value is False. @@ -2046,7 +2046,7 @@ add_newdoc('numpy.core.umath', 'logical_and', Returns ------- - y : {ndarray, bool} + y : ndarray or bool Boolean result with the same shape as `x1` and `x2` of the logical AND operation on corresponding elements of `x1` and `x2`. @@ -2112,7 +2112,7 @@ add_newdoc('numpy.core.umath', 'logical_or', Returns ------- - y : {ndarray, bool} + y : ndarray or bool Boolean result with the same shape as `x1` and `x2` of the logical OR operation on elements of `x1` and `x2`. diff --git a/numpy/core/defchararray.py b/numpy/core/defchararray.py index 121e32314..cc6cb5a38 100644 --- a/numpy/core/defchararray.py +++ b/numpy/core/defchararray.py @@ -109,7 +109,7 @@ def equal(x1, x2): Returns ------- - out : {ndarray, bool} + out : ndarray or bool Output array of bools, or a single bool if x1 and x2 are scalars. See Also @@ -133,7 +133,7 @@ def not_equal(x1, x2): Returns ------- - out : {ndarray, bool} + out : ndarray or bool Output array of bools, or a single bool if x1 and x2 are scalars. See Also @@ -158,7 +158,7 @@ def greater_equal(x1, x2): Returns ------- - out : {ndarray, bool} + out : ndarray or bool Output array of bools, or a single bool if x1 and x2 are scalars. See Also @@ -182,7 +182,7 @@ def less_equal(x1, x2): Returns ------- - out : {ndarray, bool} + out : ndarray or bool Output array of bools, or a single bool if x1 and x2 are scalars. See Also @@ -206,7 +206,7 @@ def greater(x1, x2): Returns ------- - out : {ndarray, bool} + out : ndarray or bool Output array of bools, or a single bool if x1 and x2 are scalars. See Also @@ -230,7 +230,7 @@ def less(x1, x2): Returns ------- - out : {ndarray, bool} + out : ndarray or bool Output array of bools, or a single bool if x1 and x2 are scalars. See Also diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 84a10bf04..9b75255da 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -355,7 +355,7 @@ def repeat(a, repeats, axis=None): ---------- a : array_like Input array. - repeats : {int, array of ints} + repeats : int or array of ints The number of repetitions for each element. `repeats` is broadcasted to fit the shape of the given axis. axis : int, optional diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py index bbfdce794..a48199a82 100644 --- a/numpy/lib/arraypad.py +++ b/numpy/lib/arraypad.py @@ -1105,7 +1105,7 @@ def pad(array, pad_width, mode=None, **kwargs): ((before, after),) yields same before and after pad for each axis. (pad,) or int is a shortcut for before = after = pad width for all axes. - mode : {str, function} + mode : str or function One of the following string values or a user supplied function. 'constant' @@ -1140,7 +1140,7 @@ def pad(array, pad_width, mode=None, **kwargs): end values are used to pad the beginning. <function> Padding function, see Notes. - stat_length : {sequence, int}, optional + stat_length : sequence or int, optional Used in 'maximum', 'mean', 'median', and 'minimum'. Number of values at edge of each axis used to calculate the statistic value. @@ -1154,7 +1154,7 @@ def pad(array, pad_width, mode=None, **kwargs): length for all axes. Default is ``None``, to use the entire axis. - constant_values : {sequence, int}, optional + constant_values : sequence or int, optional Used in 'constant'. The values to set the padded values for each axis. @@ -1168,7 +1168,7 @@ def pad(array, pad_width, mode=None, **kwargs): all axes. Default is 0. - end_values : {sequence, int}, optional + end_values : sequence or int, optional Used in 'linear_ramp'. The values used for the ending value of the linear_ramp and that will form the edge of the padded array. @@ -1182,7 +1182,7 @@ def pad(array, pad_width, mode=None, **kwargs): all axes. Default is 0. - reflect_type : str {'even', 'odd'}, optional + reflect_type : {'even', 'odd'}, optional Used in 'reflect', and 'symmetric'. The 'even' style is the default with an unaltered reflection around the edge value. For the 'odd' style, the extented part of the array is created by diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py index 2b867e244..de9376300 100644 --- a/numpy/lib/polynomial.py +++ b/numpy/lib/polynomial.py @@ -253,12 +253,12 @@ def polyint(p, m=1, k=None): Parameters ---------- - p : {array_like, poly1d} + p : array_like or poly1d Polynomial to differentiate. A sequence is interpreted as polynomial coefficients, see `poly1d`. m : int, optional Order of the antiderivative. (Default: 1) - k : {None, list of `m` scalars, scalar}, optional + k : list of `m` scalars or scalar, optional Integration constants. They are given in the order of integration: those corresponding to highest-order terms come first. |