Make preferred_plugins a dict

This commit is contained in:
Tony S Yu
2013-12-04 22:58:35 -06:00
parent 6994bc53b9
commit ac4eb5ae7b
2 changed files with 5 additions and 4 deletions
+4 -3
View File
@@ -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:
+1 -1
View File
@@ -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