summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorMark Wiebe <mwwiebe@gmail.com>2011-08-16 09:07:16 -0700
committerCharles Harris <charlesr.harris@gmail.com>2011-08-27 07:26:54 -0600
commit99a21efff4b1f2292dc370c7c9c7c58f10385f2a (patch)
treec1526f43815ade40b38e22e63ee01341b36dff84 /numpy/core/fromnumeric.py
parent91e94e925764177637bc17465404a75b16c35701 (diff)
downloadnumpy-99a21efff4b1f2292dc370c7c9c7c58f10385f2a.tar.gz
ENH: missingdata: Add NA support to np.diagonal, change np.diagonal to always return a view
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 8825dc6b7..2364fbfe8 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -911,6 +911,8 @@ def diagonal(a, offset=0, axis1=0, axis2=1):
removing `axis1` and `axis2` and appending an index to the right equal
to the size of the resulting diagonals.
+ As of NumPy 1.7, this function always returns a view into `a`.
+
Parameters
----------
a : array_like