Trying to avoid name collisions.

skimage/segmentation/__init__.py

@@ -1,5 +1,5 @@
 from .random_walker_segmentation import random_walker
-from .felzenszwalb import felzenszwalb
-from .slic import slic
-from .quickshift import quickshift
+from ._felzenszwalb import felzenszwalb
+from ._slic import slic
+from ._quickshift import quickshift
 from .boundaries import find_boundaries, visualize_boundaries

skimage/segmentation/_felzenszwalb.py

@@ -1,7 +1,7 @@
 import warnings
 import numpy as np
 
-from ._felzenszwalb import _felzenszwalb_grey
+from .felzenszwalb_cy import _felzenszwalb_grey
 
 
 def felzenszwalb(image, scale=1, sigma=0.8, min_size=20):

skimage/segmentation/setup.py

@@ -11,14 +11,14 @@ def configuration(parent_package='', top_path=None):
 
     config = Configuration('segmentation', parent_package, top_path)
 
-    cython(['_felzenszwalb.pyx'], working_path=base_path)
-    config.add_extension('_felzenszwalb', sources=['_felzenszwalb.c'],
+    cython(['felzenszwalb_cy.pyx'], working_path=base_path)
+    config.add_extension('felzenszwalb_cy', sources=['felzenszwalb_cy.c'],
                          include_dirs=[get_numpy_include_dirs()])
-    cython(['quickshift.pyx'], working_path=base_path)
-    config.add_extension('quickshift', sources=['quickshift.c'],
+    cython(['_quickshift.pyx'], working_path=base_path)
+    config.add_extension('_quickshift', sources=['_quickshift.c'],
                          include_dirs=[get_numpy_include_dirs()])
-    cython(['slic.pyx'], working_path=base_path)
-    config.add_extension('slic', sources=['slic.c'],
+    cython(['_slic.pyx'], working_path=base_path)
+    config.add_extension('_slic', sources=['_slic.c'],
                          include_dirs=[get_numpy_include_dirs()])
 
     return config