diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-07-09 08:45:54 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-07-09 08:45:54 -0600 |
| commit | ff803430057f9d714099cb7e1d66ba2b6b24bf24 (patch) | |
| tree | 5f5dbb34bdd3849069867c59c02e14d6ade30175 /numpy | |
| parent | 76f9e50c9e40967d9a41cb6a630b2448af9e8687 (diff) | |
| download | numpy-ff803430057f9d714099cb7e1d66ba2b6b24bf24.tar.gz | |
STY: Fix 'copy' 'copyto' typo and remove some trailing whitespace.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/add_newdocs.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/ctors.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py index 7b3ecaa3c..1e1d237a4 100644 --- a/numpy/add_newdocs.py +++ b/numpy/add_newdocs.py @@ -3731,7 +3731,7 @@ add_newdoc('numpy.core.multiarray', 'putmask', putmask(a, mask, values) This function is deprecated as of NumPy 1.7. Use the function - ``np.copy(a, values, where=mask)`` to achieve this functionality. + ``np.copyto(a, values, where=mask)`` to achieve this functionality. Changes elements of an array based on conditional and input values. diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c index 1d8270b3e..9388c41a7 100644 --- a/numpy/core/src/multiarray/ctors.c +++ b/numpy/core/src/multiarray/ctors.c @@ -2952,7 +2952,7 @@ PyArray_MaskedCopyInto(PyArrayObject *dst, PyArrayObject *src, if (PyArray_GetMaskedDTypeTransferFunction( PyArray_ISALIGNED(src) && PyArray_ISALIGNED(dst), - src_stride, dst_stride, mask_stride, + src_stride, dst_stride, mask_stride, PyArray_DESCR(src), PyArray_DESCR(dst), PyArray_DESCR(mask), |