From e03638a9d2e41d68861a29cd48771cd6afe60691 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 10 Nov 2014 13:41:26 +0200 Subject: [PATCH] Filter won't be imported twice--check for its deprecation correctly --- skimage/filters/tests/test_filter_import.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/skimage/filters/tests/test_filter_import.py b/skimage/filters/tests/test_filter_import.py index 115b1182..ffe9d7d7 100644 --- a/skimage/filters/tests/test_filter_import.py +++ b/skimage/filters/tests/test_filter_import.py @@ -1,11 +1,11 @@ -from skimage._shared.utils import all_warnings, skimage_deprecation from warnings import catch_warnings, simplefilter -from numpy.testing import assert_warns -def import_filter(): - from skimage import filter as F - assert('sobel' in dir(F)) def test_filter_import(): - with all_warnings(): - assert_warns(skimage_deprecation, import_filter) + with catch_warnings(): + simplefilter('ignore') + from skimage import filter as F + + assert('sobel' in dir(F)) + assert any(['has been renamed' in w + for (w, _, _) in F.__warningregistry__])