From e6a9c112bd3c08bfc4e51fa3c5345c0085c314ab Mon Sep 17 00:00:00 2001 From: mattip Date: Wed, 6 Nov 2019 14:27:50 -0700 Subject: MAINT: revert gh-14800, which gave precedence to OO->O over OO->? --- numpy/linalg/tests/test_regression.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'numpy/linalg') 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) -- cgit v1.2.1