From 1278b02161b7b1cf037e3c892b4513809f935795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 17 Nov 2015 10:19:09 -0500 Subject: [PATCH] Fix circular import between regionprops and convex_hull_image --- skimage/measure/_regionprops.py | 2 +- skimage/morphology/convex_hull.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py index f38fda22..38d06ba3 100644 --- a/skimage/measure/_regionprops.py +++ b/skimage/measure/_regionprops.py @@ -5,6 +5,7 @@ from scipy import ndimage as ndi from ._label import label from . import _moments +from ..morphology.convex_hull import convex_hull_image __all__ = ['regionprops', 'perimeter'] @@ -134,7 +135,6 @@ class _RegionProperties(object): @_cached_property def convex_image(self): - from ..morphology.convex_hull import convex_hull_image return convex_hull_image(self.image) @property diff --git a/skimage/morphology/convex_hull.py b/skimage/morphology/convex_hull.py index 5926e1e0..43206c32 100644 --- a/skimage/morphology/convex_hull.py +++ b/skimage/morphology/convex_hull.py @@ -1,7 +1,7 @@ __all__ = ['convex_hull_image', 'convex_hull_object'] import numpy as np -from ..measure import grid_points_in_poly +from ..measure._pnpoly import grid_points_in_poly from ._convex_hull import possible_hull from ..measure._label import label from ..util import unique_rows