summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-08-12 15:03:47 -0600
committerCharles Harris <charlesr.harris@gmail.com>2013-08-12 15:03:47 -0600
commitdf1aa99739ce194713c11a3685b9e99ac1ee1f94 (patch)
tree1a1a27af47a7c66ea1ce7158d0fb9fd45cf31ea0 /numpy/core/fromnumeric.py
parent505dc05eee8362db98919b8ecd485fb5d8100e42 (diff)
downloadnumpy-df1aa99739ce194713c11a3685b9e99ac1ee1f94.tar.gz
DOC: Remove references to diagonal changes in 1.8.
Not happening. Also remove reference to selecting multiple fields out of an array returning a view from 1.8.0 release notes. Closes #3228.
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 0dacd4bca..3ed1c13b0 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -1130,10 +1130,10 @@ def diagonal(a, offset=0, axis1=0, axis2=1):
on this fact is deprecated. Writing to the resulting array continues to
work as it used to, but a FutureWarning will be issued.
- In NumPy 1.8, it will switch to returning a read-only view on the original
+ In NumPy 1.9, it will switch to returning a read-only view on the original
array. Attempting to write to the resulting array will produce an error.
- In NumPy 1.9, it will still return a view, but this view will no longer be
+ In NumPy 1.10, it will still return a view, but this view will no longer be
marked read-only. Writing to the returned array will alter your original
array as well.