summaryrefslogtreecommitdiff
path: root/numpy/add_newdocs.py
diff options
context:
space:
mode:
authorMark Wiebe <mwwiebe@gmail.com>2011-08-16 16:54:16 -0700
committerCharles Harris <charlesr.harris@gmail.com>2011-08-27 07:26:55 -0600
commit9194b3af704df71aa9b1ff2f53f169848d0f9dc7 (patch)
tree1e6624032156dfa190e1adba79cc76e5700f19ce /numpy/add_newdocs.py
parent99a21efff4b1f2292dc370c7c9c7c58f10385f2a (diff)
downloadnumpy-9194b3af704df71aa9b1ff2f53f169848d0f9dc7.tar.gz
ENH: missingdata: Rewrite PyArray_Concatenate to work with NA masks
It should also have less memory usage for heterogeneous inputs, because it no longer makes extra copies in that case.
Diffstat (limited to 'numpy/add_newdocs.py')
-rw-r--r--numpy/add_newdocs.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
index d992a7122..82f59c6b0 100644
--- a/numpy/add_newdocs.py
+++ b/numpy/add_newdocs.py
@@ -3702,7 +3702,7 @@ add_newdoc('numpy.core.multiarray', 'ndarray', ('put',
add_newdoc('numpy.core.multiarray', 'copyto',
"""
- copyto(dst, src, casting='same_kind', where=None)
+ copyto(dst, src, casting='same_kind', where=None, preservena=False)
Copies values from `src` into `dst`, broadcasting as necessary.
Raises a TypeError if the casting rule is violated, and if
@@ -3725,10 +3725,13 @@ add_newdoc('numpy.core.multiarray', 'copyto',
* 'same_kind' means only safe casts or casts within a kind,
like float64 to float32, are allowed.
* 'unsafe' means any data conversions may be done.
- where : array_like of bool
+ where : array_like of bool, optional
A boolean array which is broadcasted to match the dimensions
of `dst`, and selects elements to copy from `src` to `dst`
wherever it contains the value True.
+ preservena : bool, optional
+ If set to True, leaves any NA values in `dst` untouched. This
+ is similar to the "hard mask" feature in numpy.ma.
""")