summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-07-01 13:18:22 -0600
committerCharles Harris <charlesr.harris@gmail.com>2015-07-01 23:40:55 -0600
commit1393a575c58f1ba86b1684ba9677ad134d057a93 (patch)
treedaf8bb2837b5e14ed59d1ad4e1b6c98a1666b5fe
parent430a3796e11dd11bdc3db7838ff1bcf159105978 (diff)
downloadnumpy-1393a575c58f1ba86b1684ba9677ad134d057a93.tar.gz
DOC: Remove references to removed setasflat ndarray method.
-rw-r--r--doc/source/reference/arrays.ndarray.rst1
-rw-r--r--numpy/add_newdocs.py31
-rw-r--r--numpy/matrixlib/tests/test_defmatrix.py2
3 files changed, 1 insertions, 33 deletions
diff --git a/doc/source/reference/arrays.ndarray.rst b/doc/source/reference/arrays.ndarray.rst
index e84b7fdf8..e72c5ce86 100644
--- a/doc/source/reference/arrays.ndarray.rst
+++ b/doc/source/reference/arrays.ndarray.rst
@@ -292,7 +292,6 @@ Array conversion
ndarray.item
ndarray.tolist
ndarray.itemset
- ndarray.setasflat
ndarray.tostring
ndarray.tobytes
ndarray.tofile
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
index 75f88a85f..be32d0cfa 100644
--- a/numpy/add_newdocs.py
+++ b/numpy/add_newdocs.py
@@ -3736,37 +3736,6 @@ add_newdoc('numpy.core.multiarray', 'ndarray', ('itemset',
"""))
-add_newdoc('numpy.core.multiarray', 'ndarray', ('setasflat',
- """
- a.setasflat(arr)
-
- Equivalent to a.flat = arr.flat, but is generally more efficient.
- This function does not check for overlap, so if ``arr`` and ``a``
- are viewing the same data with different strides, the results will
- be unpredictable.
-
- Parameters
- ----------
- arr : array_like
- The array to copy into a.
-
- Examples
- --------
- >>> a = np.arange(2*4).reshape(2,4)[:,:-1]; a
- array([[0, 1, 2],
- [4, 5, 6]])
- >>> b = np.arange(3*3, dtype='f4').reshape(3,3).T[::-1,:-1]; b
- array([[ 2., 5.],
- [ 1., 4.],
- [ 0., 3.]], dtype=float32)
- >>> a.setasflat(b)
- >>> a
- array([[2, 5, 1],
- [4, 0, 3]])
-
- """))
-
-
add_newdoc('numpy.core.multiarray', 'ndarray', ('max',
"""
a.max(axis=None, out=None)
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py
index 166f68862..c7645d1e0 100644
--- a/numpy/matrixlib/tests/test_defmatrix.py
+++ b/numpy/matrixlib/tests/test_defmatrix.py
@@ -287,7 +287,7 @@ class TestMatrixReturn(TestCase):
'partition', 'argpartition',
'take', 'tofile', 'tolist', 'tostring', 'tobytes', 'all', 'any',
'sum', 'argmax', 'argmin', 'min', 'max', 'mean', 'var', 'ptp',
- 'prod', 'std', 'ctypes', 'itemset', 'setasflat'
+ 'prod', 'std', 'ctypes', 'itemset',
]
for attrib in dir(a):
if attrib.startswith('_') or attrib in excluded_methods: