From ac4eb5ae7b0856712fa01c9dc4c460d25782fcb8 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Wed, 4 Dec 2013 22:58:35 -0600 Subject: [PATCH] Make preferred_plugins a dict --- skimage/io/_plugins/plugin.py | 7 ++++--- skimage/io/tests/test_plugin.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/skimage/io/_plugins/plugin.py b/skimage/io/_plugins/plugin.py index 5352a511..6657ebbc 100644 --- a/skimage/io/_plugins/plugin.py +++ b/skimage/io/_plugins/plugin.py @@ -24,8 +24,9 @@ plugin_provides = {} plugin_module_name = {} plugin_meta_data = {} -preferred_plugins = ['matplotlib', 'pil', 'qt', 'freeimage', 'null'] - +preferred_plugins = { + 'io': ['matplotlib', 'pil', 'qt', 'freeimage', 'null'] +} def _clear_plugins(): """Clear the plugin state to the default, i.e., where no plugins are loaded @@ -44,7 +45,7 @@ def _load_preferred_plugins(): # Load preferred plugin for each io function. io_funcs = ['imsave', 'imshow', 'imread_collection', 'imread'] for func in io_funcs: - for plugin in preferred_plugins: + for plugin in preferred_plugins['io']: if plugin not in available_plugins: continue try: diff --git a/skimage/io/tests/test_plugin.py b/skimage/io/tests/test_plugin.py index 4be829ca..53f105a2 100644 --- a/skimage/io/tests/test_plugin.py +++ b/skimage/io/tests/test_plugin.py @@ -95,7 +95,7 @@ def test_available(): def test_load_preferred_plugins(): from skimage.io._plugins import null_plugin - plugin.preferred_plugins = ['null'] + plugin.preferred_plugins['io'] = ['null'] plugin.reset_plugins() plug, func = plugin.plugin_store['imshow'][0] assert func == null_plugin.imshow