summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorNathaniel J. Smith <njs@pobox.com>2012-07-17 16:56:04 +0100
committerNathaniel J. Smith <njs@pobox.com>2012-07-17 17:00:38 +0100
commitb798f12abac2c5ac807fe9f523fd89e57efaa57c (patch)
tree73d3a9a0a2e21a86d495ebbab60a0729fdaa98df /numpy/core/fromnumeric.py
parent1234d1ccc891c427e090eff6d45f8e195330f96a (diff)
downloadnumpy-b798f12abac2c5ac807fe9f523fd89e57efaa57c.tar.gz
Switch WARN_ON_WRITE to issuing FutureWarnings instead of DeprecationWarnings
FutureWarnings are displayed by default, so they should be used whenever a future change will change the semantics of existing code (as opposed to making existing code simply stop working). List discussion: http://www.mail-archive.com/numpy-discussion@scipy.org/msg37500.html
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 3e89079dd..d73f1313c 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -937,7 +937,7 @@ def diagonal(a, offset=0, axis1=0, axis2=1):
In NumPy 1.7, it continues to return a copy of the diagonal, but depending
on this fact is deprecated. Writing to the resulting array continues to
- work as it used to, but a DeprecationWarning will be issued.
+ 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
array. Attempting to write to the resulting array will produce an error.