From f86b6212bc733afe189b26d6fc87be07f1a06c44 Mon Sep 17 00:00:00 2001
From: Julien Coste <julien.coste@inria.fr>
Date: Sun, 31 Aug 2014 12:27:02 +0100
Subject: [PATCH] Canny is now deprecated and will be in api_changes in v0.13

---
 TODO.txt                   | 2 +-
 doc/source/api_changes.txt | 4 ----
 skimage/filter/__init__.py | 7 ++++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index f17b088f..e8e70e6c 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,7 +3,7 @@ Remember to list any API changes below in `doc/source/api_changes.txt`.
 Version 0.13
 ------------
 * Remove deprecated `None` defaults for `skimage.exposure.rescale_intensity`
-* Remove deprecated `skimage.filter.canny` import in __init__.py that is now in `skimage.feature.canny`
+* Remove deprecated `skimage.filter.canny` import in __init__.py that is now in `skimage.feature.canny` (and complete api_changes.txt. `GitHub discuss <https://github.com/scikit-image/scikit-image/pull/1113/files#r16934196>`__ )
 
 Version 0.12
 ------------
diff --git a/doc/source/api_changes.txt b/doc/source/api_changes.txt
index 063ab10c..0271bec0 100644
--- a/doc/source/api_changes.txt
+++ b/doc/source/api_changes.txt
@@ -1,7 +1,3 @@
-Version 0.11
-------------
-- Move ``skimage.filter.canny`` to ``skimage.feature.canny``
-
 Version 0.10
 ------------
 - Removed ``skimage.io.video`` functionality due to broken gstreamer bindings
diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py
index 4706f258..75bbb6b9 100644
--- a/skimage/filter/__init__.py
+++ b/skimage/filter/__init__.py
@@ -1,6 +1,5 @@
 from .lpi_filter import inverse, wiener, LPIFilter2D
 from ._gaussian import gaussian_filter
-# Backward compatibility v<0.11
 from .edges import (sobel, hsobel, vsobel, scharr, hscharr, vscharr, prewitt,
                     hprewitt, vprewitt, roberts, roberts_positive_diagonal,
                     roberts_negative_diagonal)
@@ -9,8 +8,6 @@ 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
 from skimage import restoration
@@ -21,6 +18,10 @@ denoise_tv_bregman = deprecated('skimage.restoration.denoise_tv_bregman')\
 denoise_tv_chambolle = deprecated('skimage.restoration.denoise_tv_chambolle')\
                         (restoration.denoise_tv_chambolle)
 
+# Backward compatibility v<0.11
+from ..feature import canny
+canny = deprecated('skimage.feature.canny')(canny)
+
 
 __all__ = ['inverse',
            'wiener',