From 0d1cc0f77d54e2899d2958a99df679d8ffcbd19f Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Fri, 9 May 2014 02:53:48 +0200 Subject: [PATCH] Fix broken and circular imports --- skimage/measure/_regionprops.py | 2 +- skimage/morphology/tests/test_ccomp.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py index 86414456..a8c4bd65 100644 --- a/skimage/measure/_regionprops.py +++ b/skimage/measure/_regionprops.py @@ -4,7 +4,7 @@ from math import sqrt, atan2, pi as PI import numpy as np from scipy import ndimage -from skimage.morphology import convex_hull_image +from ..morphology.convex_hull import convex_hull_image from ._ccomp import label from . import _moments diff --git a/skimage/morphology/tests/test_ccomp.py b/skimage/morphology/tests/test_ccomp.py index 2ca5577f..69b4b9e5 100644 --- a/skimage/morphology/tests/test_ccomp.py +++ b/skimage/morphology/tests/test_ccomp.py @@ -3,7 +3,7 @@ from numpy.testing import assert_array_equal, run_module_suite from skimage.morphology import label from warnings import catch_warnings -from _shared.util import skimage_deprecation +from skimage._shared.utils import skimage_deprecation class TestConnectedComponents: def setup(self):