From 936211bbcb33af609438b543dfc4bc3a5965feac Mon Sep 17 00:00:00 2001
From: Julien Coste <julien.coste@inria.fr>
Date: Sun, 31 Aug 2014 12:15:47 +0100
Subject: [PATCH] move import to avoid infinte recursion (filter import peak
 that import feature that import filter)

---
 skimage/filter/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py
index 9d9fea59..4706f258 100644
--- a/skimage/filter/__init__.py
+++ b/skimage/filter/__init__.py
@@ -1,7 +1,6 @@
 from .lpi_filter import inverse, wiener, LPIFilter2D
 from ._gaussian import gaussian_filter
 # Backward compatibility v<0.11
-from ..feature import canny
 from .edges import (sobel, hsobel, vsobel, scharr, hscharr, vscharr, prewitt,
                     hprewitt, vprewitt, roberts, roberts_positive_diagonal,
                     roberts_negative_diagonal)
@@ -10,6 +9,7 @@ from ._gabor import gabor_kernel, gabor_filter
 from .thresholding import (threshold_adaptive, threshold_otsu, threshold_yen,
                            threshold_isodata)
 from . import rank
+from ..feature import canny
 
 
 from skimage._shared.utils import deprecated