From 8a337dbe465aba617242719712607a38a983db91 Mon Sep 17 00:00:00 2001
From: Julien Coste <julien.coste@inria.fr>
Date: Sun, 31 Aug 2014 10:55:12 +0100
Subject: [PATCH] Move canny from filter to feature

---
 skimage/feature/__init__.py                     | 4 +++-
 skimage/{filter => feature}/_canny.py           | 0
 skimage/feature/tests/__init__.py               | 1 +
 skimage/{filter => feature}/tests/test_canny.py | 2 +-
 skimage/filter/__init__.py                      | 3 ++-
 skimage/viewer/plugins/canny.py                 | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)
 rename skimage/{filter => feature}/_canny.py (100%)
 create mode 100644 skimage/feature/tests/__init__.py
 rename skimage/{filter => feature}/tests/test_canny.py (99%)

diff --git a/skimage/feature/__init__.py b/skimage/feature/__init__.py
index c46fde01..90bb6e53 100644
--- a/skimage/feature/__init__.py
+++ b/skimage/feature/__init__.py
@@ -1,3 +1,4 @@
+from ._canny import canny
 from ._daisy import daisy
 from ._hog import hog
 from .texture import greycomatrix, greycoprops, local_binary_pattern
@@ -17,7 +18,8 @@ from .util import plot_matches
 from .blob import blob_dog, blob_log, blob_doh
 
 
-__all__ = ['daisy',
+__all__ = ['canny'
+           'daisy',
            'hog',
            'greycomatrix',
            'greycoprops',
diff --git a/skimage/filter/_canny.py b/skimage/feature/_canny.py
similarity index 100%
rename from skimage/filter/_canny.py
rename to skimage/feature/_canny.py
diff --git a/skimage/feature/tests/__init__.py b/skimage/feature/tests/__init__.py
new file mode 100644
index 00000000..fc970954
--- /dev/null
+++ b/skimage/feature/tests/__init__.py
@@ -0,0 +1 @@
+__author__ = 'julien'
diff --git a/skimage/filter/tests/test_canny.py b/skimage/feature/tests/test_canny.py
similarity index 99%
rename from skimage/filter/tests/test_canny.py
rename to skimage/feature/tests/test_canny.py
index 2c758edf..43db5037 100644
--- a/skimage/filter/tests/test_canny.py
+++ b/skimage/feature/tests/test_canny.py
@@ -1,7 +1,7 @@
 import unittest
 import numpy as np
 from scipy.ndimage import binary_dilation, binary_erosion
-import skimage.filter as F
+import skimage.feature as F
 
 
 class TestCanny(unittest.TestCase):
diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py
index 649eba6b..61b697d7 100644
--- a/skimage/filter/__init__.py
+++ b/skimage/filter/__init__.py
@@ -1,6 +1,7 @@
 from .lpi_filter import inverse, wiener, LPIFilter2D
 from ._gaussian import gaussian_filter
-from ._canny import canny
+# Backward compatibility v<0.10
+from ..feature._canny import canny
 from .edges import (sobel, hsobel, vsobel, scharr, hscharr, vscharr, prewitt,
                     hprewitt, vprewitt, roberts, roberts_positive_diagonal,
                     roberts_negative_diagonal)
diff --git a/skimage/viewer/plugins/canny.py b/skimage/viewer/plugins/canny.py
index c2294ba8..83e80890 100644
--- a/skimage/viewer/plugins/canny.py
+++ b/skimage/viewer/plugins/canny.py
@@ -1,7 +1,7 @@
 import numpy as np
 
 import skimage
-from skimage.filter import canny
+from skimage.feature import canny
 from .overlayplugin import OverlayPlugin
 from ..widgets import Slider, ComboBox