Move canny from filter to feature

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',

skimage/feature/tests/__init__.py

@@ -0,0 +1 @@
+__author__ = 'julien'

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):

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)

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