diff options
| author | mattip <matti.picus@gmail.com> | 2019-11-06 14:27:50 -0700 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2019-11-06 14:27:50 -0700 |
| commit | e6a9c112bd3c08bfc4e51fa3c5345c0085c314ab (patch) | |
| tree | e9ade33691d9801c996f6f6c1f65b9059ebfdf54 /numpy/linalg | |
| parent | 480dc6bc01aa465389fcad0c85502d25d954f579 (diff) | |
| download | numpy-e6a9c112bd3c08bfc4e51fa3c5345c0085c314ab.tar.gz | |
MAINT: revert gh-14800, which gave precedence to OO->O over OO->?
Diffstat (limited to 'numpy/linalg')
| -rw-r--r-- | numpy/linalg/tests/test_regression.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/linalg/tests/test_regression.py b/numpy/linalg/tests/test_regression.py index 289566109..bd3a45872 100644 --- a/numpy/linalg/tests/test_regression.py +++ b/numpy/linalg/tests/test_regression.py @@ -109,9 +109,10 @@ class TestRegression(object): assert_raises(ValueError, linalg.norm, testvector, ord='nuc') assert_raises(ValueError, linalg.norm, testvector, ord=np.inf) assert_raises(ValueError, linalg.norm, testvector, ord=-np.inf) - # Succeeds, equivalent to "sum(x != 0)" - r = linalg.norm(testvector, ord=0) - assert_(r.dtype == 'bool') + with warnings.catch_warnings(): + warnings.simplefilter("error", DeprecationWarning) + assert_raises((AttributeError, DeprecationWarning), + linalg.norm, testvector, ord=0) assert_raises(ValueError, linalg.norm, testvector, ord=-1) assert_raises(ValueError, linalg.norm, testvector, ord=-2) |