diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2020-12-29 14:15:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-29 14:15:14 -0700 |
commit | 1b8b46b3f2f68f5be8e52e798eb91c2ac5952745 (patch) | |
tree | 74a8e5e3caca6405596c859384f5ca45e90f2fdd /numpy/core | |
parent | 610433b03ef720c8bec7dbf7573a6abe4f913031 (diff) | |
parent | f36e940a4726abb38c4929259e8eaf00d68c3d18 (diff) | |
download | numpy-1b8b46b3f2f68f5be8e52e798eb91c2ac5952745.tar.gz |
Merge pull request #18091 from anntzer/docset
DOC: Avoid using "set of" when talking about an ordered list.
Diffstat (limited to 'numpy/core')
-rw-r--r-- | numpy/core/fromnumeric.py | 2 | ||||
-rw-r--r-- | numpy/core/src/multiarray/methods.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index efb052bc2..52df1aad9 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -308,7 +308,7 @@ def _choose_dispatcher(a, choices, out=None, mode=None): @array_function_dispatch(_choose_dispatcher) def choose(a, choices, out=None, mode='raise'): """ - Construct an array from an index array and a set of arrays to choose from. + Construct an array from an index array and a list of arrays to choose from. First of all, if confused or uncertain, definitely look at the Examples - in its full generality, this function is less simple than it might diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c index 9c8bb4135..8bcf591a2 100644 --- a/numpy/core/src/multiarray/methods.c +++ b/numpy/core/src/multiarray/methods.c @@ -1019,7 +1019,7 @@ array_getarray(PyArrayObject *self, PyObject *args) } /* - * Check whether any of a set of input and output args have a non-default + * Check whether any of the input and output args have a non-default * __array_ufunc__ method. Return 1 if so, 0 if not, and -1 on error. * * This function primarily exists to help ndarray.__array_ufunc__ determine |