diff options
| author | Jaime Fernandez <jaime.frio@gmail.com> | 2015-05-10 03:47:21 -0700 |
|---|---|---|
| committer | Jaime Fernandez <jaime.frio@gmail.com> | 2015-05-13 20:38:44 -0700 |
| commit | 780cd6e70627f78f57cad3b1486e81936c1572a9 (patch) | |
| tree | 5b85df44ba6e311a6f202c543a5834485f7efe38 /numpy/matrixlib/tests | |
| parent | 30e3d41b6d11c18e17eb283a61bbe9bbf4bb4d8f (diff) | |
| download | numpy-780cd6e70627f78f57cad3b1486e81936c1572a9.tar.gz | |
BUG: np.nonzero behaving differently for 1-D arrays
Fixes #5837
Diffstat (limited to 'numpy/matrixlib/tests')
| -rw-r--r-- | numpy/matrixlib/tests/test_defmatrix.py | 4 | ||||
| -rw-r--r-- | numpy/matrixlib/tests/test_regression.py | 4 |
2 files changed, 4 insertions, 4 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): diff --git a/numpy/matrixlib/tests/test_regression.py b/numpy/matrixlib/tests/test_regression.py index 119b21d8a..40062653f 100644 --- a/numpy/matrixlib/tests/test_regression.py +++ b/numpy/matrixlib/tests/test_regression.py @@ -17,8 +17,8 @@ class TestRegression(TestCase): assert_(type(a.real) is np.matrix) assert_(type(a.imag) is np.matrix) c, d = np.matrix([0.0]).nonzero() - assert_(type(c) is np.matrix) - assert_(type(d) is np.matrix) + assert_(type(c) is np.ndarray) + assert_(type(d) is np.ndarray) def test_matrix_multiply_by_1d_vector(self, level=rlevel) : """Ticket #473""" |