hack to avoid circular import when import canny

This commit is contained in:
Julien Coste
2014-08-31 15:21:46 +01:00
parent f86b6212bc
commit f8a0f27265
2 changed files with 7 additions and 3 deletions
+2 -1
View File
@@ -3,7 +3,8 @@ 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` (and complete api_changes.txt. `GitHub discuss <https://github.com/scikit-image/scikit-image/pull/1113/files#r16934196>`__ )
* Remove deprecated `skimage.filter.canny` import in filter/__init__.py file (canny is now in `skimage.feature.canny`).
* Don't forget to complete api_changes.txt. (`GitHub discuss <https://github.com/scikit-image/scikit-image/pull/1113>`__ )
Version 0.12
------------
+5 -2
View File
@@ -19,8 +19,11 @@ 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)
@deprecated
def canny(*args, **kwargs):
# Hack to avoid circular import
from skimage.feature._canny import canny as canny_
return canny_(*args, **kwargs)
__all__ = ['inverse',