From a641ce6a0e236fd00b2371f9252a64d1bfc3ef78 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 15 Dec 2012 15:59:14 -0500 Subject: [PATCH] BUG: Move import inside deprecated function Fixes circular import --- skimage/morphology/watershed.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/skimage/morphology/watershed.py b/skimage/morphology/watershed.py index 6d5a8371..b6f2a4fb 100644 --- a/skimage/morphology/watershed.py +++ b/skimage/morphology/watershed.py @@ -28,7 +28,6 @@ from _heapq import heappush, heappop import numpy as np import scipy.ndimage from ..filter import rank_order -from ..feature import peak_local_max from .._shared.utils import deprecated from . import _watershed @@ -293,6 +292,8 @@ def is_local_maximum(image, labels=None, footprint=None): [False, True, False, True]], dtype=bool) """ + # call import here to prevent circular imports + from ..feature import peak_local_max return peak_local_max(image, labels=labels, min_distance=1, threshold_rel=0, footprint=footprint, indices=False, exclude_border=False)