diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-01-03 17:55:43 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-01-04 08:17:46 -0700 |
| commit | ea927d961dfc32b6963aed3b3a10bc51c12543df (patch) | |
| tree | 2381b2f1a9613b43a1614a38218f220a5ecd7c92 /numpy/matrixlib/tests/test_defmatrix.py | |
| parent | ad2d26442a4cf39ca378040f56ee928e673ad42a (diff) | |
| download | numpy-ea927d961dfc32b6963aed3b3a10bc51c12543df.tar.gz | |
BUG: Make ravel function return 1-D arrays for matrix argument.
This is a backward compatibility hack to avoid breaking scipy.sparse
after fixing ravel to respect subtypes. Subtypes are still respected
except in the case of matrices and subclasses of matrices.
Diffstat (limited to 'numpy/matrixlib/tests/test_defmatrix.py')
| -rw-r--r-- | numpy/matrixlib/tests/test_defmatrix.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/matrixlib/tests/test_defmatrix.py b/numpy/matrixlib/tests/test_defmatrix.py index 93843c55c..f3a8e72ca 100644 --- a/numpy/matrixlib/tests/test_defmatrix.py +++ b/numpy/matrixlib/tests/test_defmatrix.py @@ -409,7 +409,7 @@ class TestShape(TestCase): def test_numpy_ravel(self): assert_equal(np.ravel(self.a).shape, (2,)) - assert_equal(np.ravel(self.m).shape, (1, 2)) + assert_equal(np.ravel(self.m).shape, (2,)) def test_member_ravel(self): assert_equal(self.a.ravel().shape, (2,)) @@ -426,10 +426,10 @@ class TestShape(TestCase): assert_equal(np.ravel(x.T), [1, 4, 2, 5, 3, 6]) assert_equal(np.ravel(x.T, order='A'), [1, 2, 3, 4, 5, 6]) x = matrix([[1, 2, 3], [4, 5, 6]]) - assert_equal(np.ravel(x), [[1, 2, 3, 4, 5, 6]]) - assert_equal(np.ravel(x, order='F'), [[1, 4, 2, 5, 3, 6]]) - assert_equal(np.ravel(x.T), [[1, 4, 2, 5, 3, 6]]) - assert_equal(np.ravel(x.T, order='A'), [[1, 2, 3, 4, 5, 6]]) + assert_equal(np.ravel(x), [1, 2, 3, 4, 5, 6]) + assert_equal(np.ravel(x, order='F'), [1, 4, 2, 5, 3, 6]) + assert_equal(np.ravel(x.T), [1, 4, 2, 5, 3, 6]) + assert_equal(np.ravel(x.T, order='A'), [1, 2, 3, 4, 5, 6]) def test_matrix_ravel_order(self): x = matrix([[1, 2, 3], [4, 5, 6]]) |