diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py index 3468f263..5d361de1 100644 --- a/skimage/data/__init__.py +++ b/skimage/data/__init__.py @@ -26,7 +26,6 @@ __all__ = ['load', 'horse', 'hubble_deep_field', 'immunohistochemistry', - 'lena', 'logo', 'moon', 'page', @@ -62,22 +61,6 @@ def camera(): return load("camera.png") -@deprecated('skimage.data.astronaut') -def lena(): - """Colour "Lena" image. - - **This image has been removed from scikit-image due to copyright - concerns.** - - The standard, yet sometimes controversial Lena test image was - scanned from the November 1972 edition of Playboy magazine. From - an image processing perspective, this image is useful because it - contains smooth, textured, shaded as well as detail areas. - - """ - raise RuntimeError("This image has been removed due to copyright concerns.") - - def astronaut(): """Colour image of the astronaut Eileen Collins. diff --git a/skimage/data/tests/test_data.py b/skimage/data/tests/test_data.py index 8c48e1cc..028210dc 100644 --- a/skimage/data/tests/test_data.py +++ b/skimage/data/tests/test_data.py @@ -3,11 +3,6 @@ import skimage.data as data from numpy.testing import assert_equal, assert_almost_equal, assert_raises -def test_lena_removed(): - """ Test that "Lena" has been removed """ - assert_raises(RuntimeError, data.lena) - - def test_astronaut(): """ Test that "astronaut" image can be loaded. """ astronaut = data.astronaut()