diff options
| author | Nathaniel J. Smith <njs@pobox.com> | 2016-01-14 17:27:40 -0800 |
|---|---|---|
| committer | Nathaniel J. Smith <njs@pobox.com> | 2016-01-14 17:27:40 -0800 |
| commit | c0f6c3744ff6a54d4e9be5a98aa2d4253f537f49 (patch) | |
| tree | 89fda1d32d9dfb8523711c9b7154ffd5410c5351 /numpy/core/fromnumeric.py | |
| parent | 4b82b1bba72ef7539c06a4577b7102da9564ca02 (diff) | |
| download | numpy-c0f6c3744ff6a54d4e9be5a98aa2d4253f537f49.tar.gz | |
DOC: Clean up/fix several references to the "future" 1.10 release
Fixes gh-7010
Diffstat (limited to 'numpy/core/fromnumeric.py')
| -rw-r--r-- | numpy/core/fromnumeric.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index 67d2c5b48..5d74bbda0 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -1217,11 +1217,11 @@ def diagonal(a, offset=0, axis1=0, axis2=1): but depending on this fact is deprecated. Writing to the resulting array continues to work as it used to, but a FutureWarning is issued. - In NumPy 1.9 it returns a read-only view on the original array. + Starting in NumPy 1.9 it returns a read-only view on the original array. Attempting to write to the resulting array will produce an error. - In NumPy 1.10, it will return a read/write view and writing to the - returned array will alter your original array. The returned array + In some future release, it will return a read/write view and writing to + the returned array will alter your original array. The returned array will have the same type as the input array. If you don't write to the array returned by this function, then you can |