From 2e0deb9595cd80b33ef53833773fb6d9380793b0 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 24 Dec 2014 07:47:05 -0600 Subject: [PATCH] Fix syntax error and missing | operator --- skimage/exposure/tests/test_exposure.py | 2 +- skimage/morphology/tests/test_grey.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py index 6e93d1af..1316ea4e 100644 --- a/skimage/exposure/tests/test_exposure.py +++ b/skimage/exposure/tests/test_exposure.py @@ -211,7 +211,7 @@ def test_adapthist_grayscale(): img = skimage.img_as_float(data.astronaut()) img = rgb2gray(img) img = np.dstack((img, img, img)) - with expected_warnings(['precision loss|non-contiguous input]): + with expected_warnings(['precision loss|non-contiguous input']): adapted = exposure.equalize_adapthist(img, 10, 9, clip_limit=0.01, nbins=128) assert_almost_equal = np.testing.assert_almost_equal diff --git a/skimage/morphology/tests/test_grey.py b/skimage/morphology/tests/test_grey.py index 86ce10f5..911e0c71 100644 --- a/skimage/morphology/tests/test_grey.py +++ b/skimage/morphology/tests/test_grey.py @@ -175,7 +175,7 @@ def test_3d_fallback_white_tophat(): with expected_warnings(['operator.*deprecated|\A\Z']): new_image = grey.white_tophat(image) footprint = ndimage.generate_binary_structure(3,1) - with expected_warnings(['operator.*deprecated\A\Z']): + with expected_warnings(['operator.*deprecated|\A\Z']): image_expected = ndimage.white_tophat(image,footprint=footprint) testing.assert_array_equal(new_image, image_expected)