summaryrefslogtreecommitdiff
path: root/numpy/add_newdocs.py
diff options
context:
space:
mode:
authorNathaniel J. Smith <njs@pobox.com>2012-10-01 17:36:01 +0100
committerNathaniel J. Smith <njs@pobox.com>2012-10-01 17:36:01 +0100
commit1a71edc55b227e590022d402e5b6558d3a9921f1 (patch)
treeaebff885c98c49db41eebf18d718d6e9840d0536 /numpy/add_newdocs.py
parente18e7441700db0ff2fd8f51901aa416c63e35cbc (diff)
downloadnumpy-1a71edc55b227e590022d402e5b6558d3a9921f1.tar.gz
[FIX] preserve memory order in np.copy()
This switches us back to the behaviour seen in numpy 1.6 and earlier, which it turns out that scikit-learn (and probably others) relied on.
Diffstat (limited to 'numpy/add_newdocs.py')
-rw-r--r--numpy/add_newdocs.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
index 20da8ea8b..09effaaf5 100644
--- a/numpy/add_newdocs.py
+++ b/numpy/add_newdocs.py
@@ -3222,10 +3222,13 @@ add_newdoc('numpy.core.multiarray', 'ndarray', ('copy',
Controls the memory layout of the copy. 'C' means C-order,
'F' means F-order, 'A' means 'F' if `a` is Fortran contiguous,
'C' otherwise. 'K' means match the layout of `a` as closely
- as possible.
+ as possible. (Note that this function and :func:numpy.copy are very
+ similar, but have different default values for their order=
+ arguments.)
See also
--------
+ numpy.copy
numpy.copyto
Examples