diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-08-15 09:55:41 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-08-15 09:55:41 -0700 |
| commit | 580a3b60abfb9fa7f9866a87dc90f7bbc6bed184 (patch) | |
| tree | 80de6fa4c44726b7b146e60c02a31e94ff942cb9 /numpy/core/fromnumeric.py | |
| parent | 4d6575b9dfbd07b8d78d8d837d0f4810974f943f (diff) | |
| parent | df1aa99739ce194713c11a3685b9e99ac1ee1f94 (diff) | |
| download | numpy-580a3b60abfb9fa7f9866a87dc90f7bbc6bed184.tar.gz | |
Merge pull request #3608 from charris/remove-1.8-diagonal-refs
DOC: Remove references to diagonal changes in 1.8.
Diffstat (limited to 'numpy/core/fromnumeric.py')
| -rw-r--r-- | numpy/core/fromnumeric.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 64dfddfbb..9d7c226fc 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. |