summaryrefslogtreecommitdiff
path: root/numpy/lib/function_base.py
diff options
context:
space:
mode:
authorJaime <jaime.frio@gmail.com>2016-03-15 16:42:48 +0100
committerJaime <jaime.frio@gmail.com>2016-03-15 16:42:48 +0100
commit1429c606643d1ad305e710c4a31cb6f398d04c53 (patch)
treeca3dc831ff1566a2794e940d1a358a17774fd59b /numpy/lib/function_base.py
parente034b86d1f40af6e15a829d093232febd4a708c3 (diff)
parent9128ed5198cc8544406467a00824e5fe6791f090 (diff)
downloadnumpy-1429c606643d1ad305e710c4a31cb6f398d04c53.tar.gz
Merge pull request #7003 from gfyoung/place_str_fix
BUG: Fix string copying for np.place
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r--numpy/lib/function_base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index c155babef..648eb5019 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -2026,7 +2026,8 @@ def place(arr, mask, vals):
vals : 1-D sequence
Values to put into `a`. Only the first N elements are used, where
N is the number of True values in `mask`. If `vals` is smaller
- than N it will be repeated.
+ than N, it will be repeated, and if elements of `a` are to be masked,
+ this sequence must be non-empty.
See Also
--------