From 5c9d7af652933392ef0b86a7dc0f8a2cb348ed2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jsch@demuc.de>
Date: Mon, 14 Oct 2013 18:20:05 +0200
Subject: [PATCH] Remove deprecated hough_* functions

---
 skimage/transform/__init__.py        |  4 +---
 skimage/transform/hough_transform.py | 24 ------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/skimage/transform/__init__.py b/skimage/transform/__init__.py
index 8fa2cfdb..4f00a076 100644
--- a/skimage/transform/__init__.py
+++ b/skimage/transform/__init__.py
@@ -1,7 +1,6 @@
 from ._hough_transform import (hough_circle, hough_ellipse, hough_line,
                                probabilistic_hough_line)
-from .hough_transform import (hough, probabilistic_hough, hough_peaks,
-                              hough_line_peaks)
+from .hough_transform import hough_line_peaks
 from .radon_transform import radon, iradon, iradon_sart
 from .finite_radon_transform import frt2, ifrt2
 from .integral import integral_image, integrate
@@ -18,7 +17,6 @@ __all__ = ['hough_circle',
            'hough_ellipse',
            'hough_line',
            'probabilistic_hough_line',
-           'hough',
            'probabilistic_hough',
            'hough_peaks',
            'hough_line_peaks',
diff --git a/skimage/transform/hough_transform.py b/skimage/transform/hough_transform.py
index 15968fd8..0a7d35a2 100644
--- a/skimage/transform/hough_transform.py
+++ b/skimage/transform/hough_transform.py
@@ -3,30 +3,6 @@ from scipy import ndimage
 from skimage import measure, morphology
 
 
-from ._hough_transform import hough_line, probabilistic_hough_line
-from skimage._shared.utils import deprecated
-
-
-@deprecated('hough_line')
-def hough(img, theta=None):
-    return hough_line(img, theta)
-
-
-@deprecated('probabilistic_hough_line')
-def probabilistic_hough(img, threshold=10, line_length=50, line_gap=10,
-                        theta=None):
-    return probabilistic_hough_line(img, threshold=threshold,
-                                    line_length=line_length, line_gap=line_gap,
-                                    theta=theta)
-
-
-@deprecated('hough_line_peaks')
-def hough_peaks(hspace, angles, dists, min_distance=10, min_angle=10,
-                threshold=None, num_peaks=np.inf):
-    return hough_line_peaks(hspace, angles, dists, min_distance, min_angle,
-                            threshold, num_peaks)
-
-
 def hough_line_peaks(hspace, angles, dists, min_distance=9, min_angle=10,
                      threshold=None, num_peaks=np.inf):
     """Return peaks in hough transform.