diff --git a/scikits/image/data/tests/test_data.py b/scikits/image/data/tests/test_data.py index b31c8851..9215d0fa 100644 --- a/scikits/image/data/tests/test_data.py +++ b/scikits/image/data/tests/test_data.py @@ -15,7 +15,6 @@ def test_camera(): def test_checkerboard(): """ Test that checkerboard image can be loaded. """ checkerboard = data.checkerboard() - assert_equal(checkerboard.dtype, np.uint8) if __name__ == "__main__": from numpy.testing import run_module_suite diff --git a/scikits/image/io/__init__.py b/scikits/image/io/__init__.py index 68059000..f6197d63 100644 --- a/scikits/image/io/__init__.py +++ b/scikits/image/io/__init__.py @@ -7,14 +7,15 @@ The following plug-ins are available: from _plugins import use as use_plugin from _plugins import available as plugins from _plugins import info as plugin_info - available_plugins = plugins() -for preferred_plugin in \ - ['pil', 'matplotlib', 'gtk', 'freeimage', 'qt', 'null']: +for preferred_plugin in ['pil', 'matplotlib', 'qt', 'null']: if preferred_plugin in available_plugins: - use_plugin(preferred_plugin) - break + try: + use_plugin(preferred_plugin) + break + except ImportError: + pass from sift import * from collection import * diff --git a/scikits/image/io/_plugins/fits_plugin.py b/scikits/image/io/_plugins/fits_plugin.py index 84215d96..9fd2aadb 100644 --- a/scikits/image/io/_plugins/fits_plugin.py +++ b/scikits/image/io/_plugins/fits_plugin.py @@ -1,6 +1,5 @@ __all__ = ['imread', 'imread_collection'] -import numpy as np import scikits.image.io as io try: diff --git a/scikits/image/io/_plugins/matplotlib_plugin.ini b/scikits/image/io/_plugins/matplotlib_plugin.ini index 39d78fbb..1c29e215 100644 --- a/scikits/image/io/_plugins/matplotlib_plugin.ini +++ b/scikits/image/io/_plugins/matplotlib_plugin.ini @@ -1,4 +1,4 @@ [matplotlib] description = Display or save images using Matplotlib -provides = imshow, _app_show +provides = imshow, imread, _app_show diff --git a/scikits/image/io/_plugins/matplotlib_plugin.py b/scikits/image/io/_plugins/matplotlib_plugin.py index 7fb70da2..f59540c4 100644 --- a/scikits/image/io/_plugins/matplotlib_plugin.py +++ b/scikits/image/io/_plugins/matplotlib_plugin.py @@ -1,5 +1,4 @@ -from matplotlib.pyplot import imshow, show +from matplotlib.pyplot import imshow, show, imread def _app_show(): show() -