From 93ee10ef98936e1fa5386836fd5b34b4b6e4bb68 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Tue, 9 Dec 2014 18:19:32 -0500 Subject: DOC : do not abuse enum markup - {ndarray, bool} -> ndarray or bool - {int, array of ints} -> int or array of ints - {str, function} -> str or function - {sequnce, int} -> sequence or int - {array_like, poly1d} -> array_like or poly1d - {None, list of `m` scalars, scalar} -> list of `m` scalars or scalar --- numpy/core/defchararray.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'numpy/core/defchararray.py') 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 -- cgit v1.2.1