From 6b7aebb56341c86c724beb24faf2a4b16fc213d8 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Mon, 2 Nov 2009 01:47:25 +0200
Subject: [PATCH] Reorganise plugin infrastructure.

---
 scikits/image/io/_plugins/__init__.py                       | 1 +
 scikits/image/io/{ => _plugins}/matplotlib_plugin.py        | 0
 scikits/image/io/{ => _plugins}/pil_plugin.py               | 0
 scikits/image/io/{ => _plugins}/plugin.py                   | 0
 scikits/image/io/{ => _plugins}/qt_plugin.py                | 0
 scikits/image/io/_plugins/test_plugin.py                    | 6 ++++++
 scikits/image/io/{_plugin_util.py => _plugins/util.py}      | 0
 .../image/io/{wxpython_plugin.py => _plugins/wx_plugin.py}  | 0
 8 files changed, 7 insertions(+)
 create mode 100644 scikits/image/io/_plugins/__init__.py
 rename scikits/image/io/{ => _plugins}/matplotlib_plugin.py (100%)
 rename scikits/image/io/{ => _plugins}/pil_plugin.py (100%)
 rename scikits/image/io/{ => _plugins}/plugin.py (100%)
 rename scikits/image/io/{ => _plugins}/qt_plugin.py (100%)
 create mode 100644 scikits/image/io/_plugins/test_plugin.py
 rename scikits/image/io/{_plugin_util.py => _plugins/util.py} (100%)
 rename scikits/image/io/{wxpython_plugin.py => _plugins/wx_plugin.py} (100%)

diff --git a/scikits/image/io/_plugins/__init__.py b/scikits/image/io/_plugins/__init__.py
new file mode 100644
index 00000000..309c2665
--- /dev/null
+++ b/scikits/image/io/_plugins/__init__.py
@@ -0,0 +1 @@
+from plugin import *
diff --git a/scikits/image/io/matplotlib_plugin.py b/scikits/image/io/_plugins/matplotlib_plugin.py
similarity index 100%
rename from scikits/image/io/matplotlib_plugin.py
rename to scikits/image/io/_plugins/matplotlib_plugin.py
diff --git a/scikits/image/io/pil_plugin.py b/scikits/image/io/_plugins/pil_plugin.py
similarity index 100%
rename from scikits/image/io/pil_plugin.py
rename to scikits/image/io/_plugins/pil_plugin.py
diff --git a/scikits/image/io/plugin.py b/scikits/image/io/_plugins/plugin.py
similarity index 100%
rename from scikits/image/io/plugin.py
rename to scikits/image/io/_plugins/plugin.py
diff --git a/scikits/image/io/qt_plugin.py b/scikits/image/io/_plugins/qt_plugin.py
similarity index 100%
rename from scikits/image/io/qt_plugin.py
rename to scikits/image/io/_plugins/qt_plugin.py
diff --git a/scikits/image/io/_plugins/test_plugin.py b/scikits/image/io/_plugins/test_plugin.py
new file mode 100644
index 00000000..bd160829
--- /dev/null
+++ b/scikits/image/io/_plugins/test_plugin.py
@@ -0,0 +1,6 @@
+import plugin
+
+def save(fname, arr):
+    return fname, arr
+
+plugin.register('test', save=save)
diff --git a/scikits/image/io/_plugin_util.py b/scikits/image/io/_plugins/util.py
similarity index 100%
rename from scikits/image/io/_plugin_util.py
rename to scikits/image/io/_plugins/util.py
diff --git a/scikits/image/io/wxpython_plugin.py b/scikits/image/io/_plugins/wx_plugin.py
similarity index 100%
rename from scikits/image/io/wxpython_plugin.py
rename to scikits/image/io/_plugins/wx_plugin.py