From 3c91aab3a06e0de770d2869eafec308b2cc3bd63 Mon Sep 17 00:00:00 2001
From: Tony S Yu <tsyu80@gmail.com>
Date: Tue, 28 Feb 2012 00:07:07 -0500
Subject: [PATCH] FIX: Check plugin is loaded before checking its functions.

---
 skimage/io/_plugins/plugin.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/skimage/io/_plugins/plugin.py b/skimage/io/_plugins/plugin.py
index eb0dfd43..5ee04f1e 100644
--- a/skimage/io/_plugins/plugin.py
+++ b/skimage/io/_plugins/plugin.py
@@ -79,6 +79,7 @@ command.  A list of all available plugins can be found using
     if plugin is None:
         _, func = plugin_funcs[0]
     else:
+        _load(plugin)
         try:
             func = [f for (p,f) in plugin_funcs if p == plugin][0]
         except IndexError:
@@ -124,8 +125,7 @@ def use(name, kind=None):
         else:
             kind = [kind]
 
-    if not name in available(loaded=True):
-        _load(name)
+    _load(name)
 
     for k in kind:
         if not k in plugin_store:
@@ -182,6 +182,8 @@ def _load(plugin):
     plugins : List of available plugins
 
     """
+    if plugin in available(loaded=True):
+        return
     if not plugin in plugin_module_name:
         raise ValueError("Plugin %s not found." % plugin)
     else: