summaryrefslogtreecommitdiff
path: root/numpy/core/defchararray.py
diff options
context:
space:
mode:
authorThomas A Caswell <tcaswell@gmail.com>2014-12-09 18:19:32 -0500
committerThomas A Caswell <tcaswell@bnl.gov>2014-12-12 14:00:39 -0500
commit93ee10ef98936e1fa5386836fd5b34b4b6e4bb68 (patch)
treec884b1d3fb8802c8164545246707ed53f7b773f1 /numpy/core/defchararray.py
parent48b61ec8c4b6e81100d96b3ab854947dd6ab1f64 (diff)
downloadnumpy-93ee10ef98936e1fa5386836fd5b34b4b6e4bb68.tar.gz
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
Diffstat (limited to 'numpy/core/defchararray.py')
-rw-r--r--numpy/core/defchararray.py12
1 files changed, 6 insertions, 6 deletions
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