From f56034630999f08a50a15e2687571b39d97294c6 Mon Sep 17 00:00:00 2001
From: Andreas Mueller <amueller@ais.uni-bonn.de>
Date: Sun, 5 Aug 2012 21:31:24 +0100
Subject: [PATCH] Trying to avoid name collisions.

---
 skimage/segmentation/__init__.py                     |  6 +++---
 .../{felzenszwalb.py => _felzenszwalb.py}            |  2 +-
 .../segmentation/{quickshift.pyx => _quickshift.pyx} |  0
 skimage/segmentation/{slic.pyx => _slic.pyx}         |  0
 .../{_felzenszwalb.pyx => felzenszwalb_cy.pyx}       |  0
 skimage/segmentation/setup.py                        | 12 ++++++------
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename skimage/segmentation/{felzenszwalb.py => _felzenszwalb.py} (98%)
 rename skimage/segmentation/{quickshift.pyx => _quickshift.pyx} (100%)
 rename skimage/segmentation/{slic.pyx => _slic.pyx} (100%)
 rename skimage/segmentation/{_felzenszwalb.pyx => felzenszwalb_cy.pyx} (100%)

diff --git a/skimage/segmentation/__init__.py b/skimage/segmentation/__init__.py
index cb06108d..69a580c6 100644
--- a/skimage/segmentation/__init__.py
+++ b/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
diff --git a/skimage/segmentation/felzenszwalb.py b/skimage/segmentation/_felzenszwalb.py
similarity index 98%
rename from skimage/segmentation/felzenszwalb.py
rename to skimage/segmentation/_felzenszwalb.py
index cf79706d..f84f3e56 100644
--- a/skimage/segmentation/felzenszwalb.py
+++ b/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):
diff --git a/skimage/segmentation/quickshift.pyx b/skimage/segmentation/_quickshift.pyx
similarity index 100%
rename from skimage/segmentation/quickshift.pyx
rename to skimage/segmentation/_quickshift.pyx
diff --git a/skimage/segmentation/slic.pyx b/skimage/segmentation/_slic.pyx
similarity index 100%
rename from skimage/segmentation/slic.pyx
rename to skimage/segmentation/_slic.pyx
diff --git a/skimage/segmentation/_felzenszwalb.pyx b/skimage/segmentation/felzenszwalb_cy.pyx
similarity index 100%
rename from skimage/segmentation/_felzenszwalb.pyx
rename to skimage/segmentation/felzenszwalb_cy.pyx
diff --git a/skimage/segmentation/setup.py b/skimage/segmentation/setup.py
index 7b7d9cf1..ec092ffe 100644
--- a/skimage/segmentation/setup.py
+++ b/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