diff options
| author | Matti Picus <matti.picus@gmail.com> | 2020-07-17 08:15:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 08:15:08 +0300 |
| commit | 56c7539c5fcfd99ebb57c223fc9d31a177d8a327 (patch) | |
| tree | c84887d4d1b4570a269fe0bd8927b35b7508e6ef /numpy/matrixlib | |
| parent | bf10f6633b5070f41ccc56a9234fb4d3c00204f1 (diff) | |
| parent | 4e8e9284719ffc3f2add7ef4e23b33569c223689 (diff) | |
| download | numpy-56c7539c5fcfd99ebb57c223fc9d31a177d8a327.tar.gz | |
Merge pull request #16232 from seberg/ufunc-outer-matrix
DEP: Deprecate ufunc.outer with matrix inputs
Diffstat (limited to 'numpy/matrixlib')
| -rw-r--r-- | numpy/matrixlib/tests/test_masked_matrix.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/matrixlib/tests/test_masked_matrix.py b/numpy/matrixlib/tests/test_masked_matrix.py index 45424ecf0..95d3f44b6 100644 --- a/numpy/matrixlib/tests/test_masked_matrix.py +++ b/numpy/matrixlib/tests/test_masked_matrix.py @@ -1,4 +1,5 @@ import numpy as np +from numpy.testing import assert_warns from numpy.ma.testutils import (assert_, assert_equal, assert_raises, assert_array_equal) from numpy.ma.core import (masked_array, masked_values, masked, allequal, @@ -198,7 +199,8 @@ class TestSubclassing: # Result should work assert_equal(add(mx, x), mx+x) assert_(isinstance(add(mx, mx)._data, np.matrix)) - assert_(isinstance(add.outer(mx, mx), MMatrix)) + with assert_warns(DeprecationWarning): + assert_(isinstance(add.outer(mx, mx), MMatrix)) assert_(isinstance(hypot(mx, mx), MMatrix)) assert_(isinstance(hypot(mx, x), MMatrix)) |