diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-06-27 14:51:04 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-06-27 14:51:04 -0400 |
| commit | 16cdeff7520819322209f89003dcc282903ca34e (patch) | |
| tree | eb48289e9d65918ca0feeeef94061e5235588954 /numpy/matrixlib/tests/test_defmatrix.py | |
| parent | 56678fe56dce97871bb49febf0b2c0206541eada (diff) | |
| parent | 780cd6e70627f78f57cad3b1486e81936c1572a9 (diff) | |
| download | numpy-16cdeff7520819322209f89003dcc282903ca34e.tar.gz | |
Merge pull request #5865 from jaimefrio/where_writeable
BUG: np.nonzero behaving differently for 1-D arrays
Diffstat (limited to 'numpy/matrixlib/tests/test_defmatrix.py')
| -rw-r--r-- | numpy/matrixlib/tests/test_defmatrix.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py index f3a8e72ca..166f68862 100644 --- a/numpy/matrixlib/tests/test_defmatrix.py +++ b/numpy/matrixlib/tests/test_defmatrix.py @@ -306,8 +306,8 @@ class TestMatrixReturn(TestCase): assert_(type(a.real) is matrix) assert_(type(a.imag) is matrix) c, d = matrix([0.0]).nonzero() - assert_(type(c) is matrix) - assert_(type(d) is matrix) + assert_(type(c) is np.ndarray) + assert_(type(d) is np.ndarray) class TestIndexing(TestCase): |