Fix duplicate find_contours names in namespace

skimage/measure/__init__.py

@@ -1,4 +1,4 @@
-from .find_contours import find_contours
+from ._find_contours import find_contours
 from ._marching_cubes import marching_cubes, mesh_surface_area
 from ._regionprops import regionprops, perimeter
 from ._structural_similarity import structural_similarity

skimage/measure/_find_contours.py

@@ -1,5 +1,5 @@
 import numpy as np
-from . import _find_contours
+from . import _find_contours_cy
 
 from collections import deque
 
@@ -115,8 +115,8 @@ def find_contours(array, level,
        positive_orientation not in _param_options):
         raise ValueError('Parameters "fully_connected" and'
         ' "positive_orientation" must be either "high" or "low".')
-    point_list = _find_contours.iterate_and_store(array, level,
-                                                  fully_connected == 'high')
+    point_list = _find_contours_cy.iterate_and_store(array, level,
+                                                     fully_connected == 'high')
     contours = _assemble_contours(_take_2(point_list))
     if positive_orientation == 'high':
         contours = [c[::-1] for c in contours]

skimage/measure/setup.py

@@ -12,11 +12,11 @@ def configuration(parent_package='', top_path=None):
     config = Configuration('measure', parent_package, top_path)
     config.add_data_dir('tests')
 
-    cython(['_find_contours.pyx'], working_path=base_path)
+    cython(['_find_contours_cy.pyx'], working_path=base_path)
     cython(['_moments.pyx'], working_path=base_path)
     cython(['_marching_cubes_cy.pyx'], working_path=base_path)
 
-    config.add_extension('_find_contours', sources=['_find_contours.c'],
+    config.add_extension('_find_contours_cy', sources=['_find_contours_cy.c'],
                          include_dirs=[get_numpy_include_dirs()])
     config.add_extension('_moments', sources=['_moments.c'],
                          include_dirs=[get_numpy_include_dirs()])