From e757b9ae06fff23615971c10e03ed52f2e87c83d Mon Sep 17 00:00:00 2001 From: Juan Nunez-Iglesias Date: Mon, 20 May 2013 14:46:11 +1000 Subject: [PATCH] Rename slic.py to avoid name conflicts --- skimage/segmentation/__init__.py | 2 +- skimage/segmentation/{slic.py => slic_superpixels.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename skimage/segmentation/{slic.py => slic_superpixels.py} (100%) diff --git a/skimage/segmentation/__init__.py b/skimage/segmentation/__init__.py index ae1bf074..107111bd 100644 --- a/skimage/segmentation/__init__.py +++ b/skimage/segmentation/__init__.py @@ -1,6 +1,6 @@ from .random_walker_segmentation import random_walker from ._felzenszwalb import felzenszwalb -from .slic import slic +from .slic_superpixels import slic from ._quickshift import quickshift from .boundaries import find_boundaries, visualize_boundaries, mark_boundaries from ._clear_border import clear_border diff --git a/skimage/segmentation/slic.py b/skimage/segmentation/slic_superpixels.py similarity index 100% rename from skimage/segmentation/slic.py rename to skimage/segmentation/slic_superpixels.py