summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJay Bourque <jay.bourque@continuum.io>2012-07-17 16:03:41 -0500
committerJay Bourque <jay.bourque@continuum.io>2012-07-17 16:05:10 -0500
commita03e8b4d286e91ef5823c059dcfb7a52ce420725 (patch)
treecf85c4c76a7591b874726bf6ed0d391dcf152c46 /doc
parent2eb9610acab872538742ce7db5cbbae6cb23360e (diff)
downloadnumpy-a03e8b4d286e91ef5823c059dcfb7a52ce420725.tar.gz
change DeprecationWarning to FutureWarning
Diffstat (limited to 'doc')
-rw-r--r--doc/release/1.7.0-notes.rst2
-rw-r--r--doc/source/reference/arrays.indexing.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/release/1.7.0-notes.rst b/doc/release/1.7.0-notes.rst
index 824b8f14b..f8f54219c 100644
--- a/doc/release/1.7.0-notes.rst
+++ b/doc/release/1.7.0-notes.rst
@@ -29,7 +29,7 @@ such an array. See the documentation for np.diagonal for details.
Similar to np.diagonal above, in a future version of numpy, indexing
a record array by a list of field names will return a view onto the
original array, instead of producing a copy as they do now. As with
-np.diagonal, numpy 1.7 produces a DeprecationWarning if it detects
+np.diagonal, numpy 1.7 produces a FutureWarning if it detects
that you may be attemping to write to such an array. See the documentation
for array indexing for details.
diff --git a/doc/source/reference/arrays.indexing.rst b/doc/source/reference/arrays.indexing.rst
index bc12c5d0e..f8966f5c1 100644
--- a/doc/source/reference/arrays.indexing.rst
+++ b/doc/source/reference/arrays.indexing.rst
@@ -339,7 +339,7 @@ Indexing into a record array can also be done with a list of field names,
*e.g.* ``x[['field-name1','field-name2']]``. Currently this returns a new
array containing a copy of the values in the fields specified in the list.
As of NumPy 1.7, returning a copy is being deprecated in favor of returning
-a view. A copy will continue to be returned for now, but a DeprecationWarning
+a view. A copy will continue to be returned for now, but a FutureWarning
will be issued when writing to the copy. If you depend on the current
behavior, then we suggest copying the returned array explicitly, i.e. use
x[['field-name1','field-name2']].copy(). This will work with both past and