From d9a3a46fb2ad75624cd65cd0b93417d121bedd67 Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Sat, 8 Oct 2011 19:59:11 +0200 Subject: [PATCH 1/7] gracefully ignore absent plugins --- scikits/image/io/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scikits/image/io/__init__.py b/scikits/image/io/__init__.py index 68059000..a6d5848a 100644 --- a/scikits/image/io/__init__.py +++ b/scikits/image/io/__init__.py @@ -7,14 +7,18 @@ 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 - +import ipdb +ipdb.set_trace() available_plugins = plugins() for preferred_plugin in \ ['pil', 'matplotlib', 'gtk', 'freeimage', '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 * From 22a424bc50cb863d94521d861f007314ec96d07c Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Sat, 8 Oct 2011 20:41:57 +0200 Subject: [PATCH 2/7] this depends on the plugin used --- scikits/image/data/tests/test_data.py | 1 - 1 file changed, 1 deletion(-) 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 From 9545f85f18dea214c5cf27737d0cd54c2f362644 Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Sat, 8 Oct 2011 20:42:09 +0200 Subject: [PATCH 3/7] removed debugging code --- scikits/image/io/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/scikits/image/io/__init__.py b/scikits/image/io/__init__.py index a6d5848a..4969aacf 100644 --- a/scikits/image/io/__init__.py +++ b/scikits/image/io/__init__.py @@ -7,8 +7,6 @@ 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 -import ipdb -ipdb.set_trace() available_plugins = plugins() for preferred_plugin in \ From d0041a8c741784b34627ef042766dbe46f2727d4 Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Sat, 8 Oct 2011 20:47:24 +0200 Subject: [PATCH 4/7] [ENH] include matplotlib's imread --- scikits/image/io/_plugins/matplotlib_plugin.ini | 2 +- scikits/image/io/_plugins/matplotlib_plugin.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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() - From 6ac19275184c07d00b337b11f283bed4fab536c6 Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Sat, 8 Oct 2011 20:47:39 +0200 Subject: [PATCH 5/7] try to load only plugins that have both imread and imshow --- scikits/image/io/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scikits/image/io/__init__.py b/scikits/image/io/__init__.py index 4969aacf..ddd1cf9f 100644 --- a/scikits/image/io/__init__.py +++ b/scikits/image/io/__init__.py @@ -9,8 +9,7 @@ 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', 'null']: if preferred_plugin in available_plugins: try: use_plugin(preferred_plugin) From fb987ac6ed18fb98e8c81d3c9224d12e5c89e00c Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Tue, 18 Oct 2011 16:55:56 +0200 Subject: [PATCH 6/7] add qt plugin again. --- scikits/image/io/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scikits/image/io/__init__.py b/scikits/image/io/__init__.py index ddd1cf9f..f6197d63 100644 --- a/scikits/image/io/__init__.py +++ b/scikits/image/io/__init__.py @@ -9,7 +9,7 @@ from _plugins import available as plugins from _plugins import info as plugin_info available_plugins = plugins() -for preferred_plugin in ['pil', 'matplotlib', 'null']: +for preferred_plugin in ['pil', 'matplotlib', 'qt', 'null']: if preferred_plugin in available_plugins: try: use_plugin(preferred_plugin) From 03e8a61fb420ed11bd4914457bd2d13a2e7e1089 Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Tue, 18 Oct 2011 16:56:41 +0200 Subject: [PATCH 7/7] COSMIT removed unused import --- scikits/image/io/_plugins/fits_plugin.py | 1 - 1 file changed, 1 deletion(-) 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: