diff options
Diffstat (limited to 'numpy/add_newdocs.py')
| -rw-r--r-- | numpy/add_newdocs.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py index f1ce48b69..a3b00925f 100644 --- a/numpy/add_newdocs.py +++ b/numpy/add_newdocs.py @@ -1902,7 +1902,7 @@ add_newdoc('numpy.core.multiarray', 'result_type', Categories are determined by first checking which of boolean, integer (int/uint), or floating point (float/complex) the maximum kind of all the arrays and the scalars are. - + If there are only scalars or the maximum category of the scalars is higher than the maximum category of the arrays, the data types are combined with :func:`promote_types` @@ -3863,9 +3863,6 @@ add_newdoc('numpy.core.multiarray', 'putmask', """ putmask(a, mask, values) - This function is deprecated as of NumPy 1.7. Use the function - ``np.copyto(a, values, where=mask)`` to achieve this functionality. - Changes elements of an array based on conditional and input values. Sets ``a.flat[n] = values[n]`` for each n where ``mask.flat[n]==True``. @@ -3873,6 +3870,9 @@ add_newdoc('numpy.core.multiarray', 'putmask', If `values` is not the same size as `a` and `mask` then it will repeat. This gives behavior different from ``a[mask] = values``. + Note that the `putmask` functionality is also provided by `copyto`, which + can be significantly faster. Use ``np.copyto(a, values, where=mask)``. + Parameters ---------- a : array_like |