From 4fce7b3b5527a824ddb8cbfe2d0130f703e74ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= <jschoenberger@demuc.de>
Date: Sat, 27 Apr 2013 17:06:41 +0200
Subject: [PATCH] Explicitly import color functions

---
 skimage/color/__init__.py | 95 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 84 insertions(+), 11 deletions(-)

diff --git a/skimage/color/__init__.py b/skimage/color/__init__.py
index a4205e3b..52d6e760 100644
--- a/skimage/color/__init__.py
+++ b/skimage/color/__init__.py
@@ -1,12 +1,85 @@
-from .colorconv import *
+from .colorconv import (convert_colorspace,
+                        rgb2hsv,
+                        hsv2rgb,
+                        rgb2xyz,
+                        xyz2rgb,
+                        rgb2rgbcie,
+                        rgbcie2rgb,
+                        rgb2grey,
+                        rgb2gray,
+                        gray2rgb,
+                        xyz2lab,
+                        lab2xyz,
+                        lab2rgb,
+                        rgb2lab,
+                        rgb2hed,
+                        hed2rgb,
+                        separate_stains,
+                        combine_stains,
+                        rgb_from_hed,
+                        hed_from_rgb,
+                        rgb_from_hdx,
+                        hdx_from_rgb,
+                        rgb_from_fgx,
+                        fgx_from_rgb,
+                        rgb_from_bex,
+                        bex_from_rgb,
+                        rgb_from_rbd,
+                        rbd_from_rgb,
+                        rgb_from_gdx,
+                        gdx_from_rgb,
+                        rgb_from_hax,
+                        hax_from_rgb,
+                        rgb_from_bro,
+                        bro_from_rgb,
+                        rgb_from_bpx,
+                        bpx_from_rgb,
+                        rgb_from_ahx,
+                        ahx_from_rgb,
+                        rgb_from_hpx,
+                        hpx_from_rgb,
+                        is_rgb,
+                        is_gray)
 
-__all__ = ['convert_colorspace', 'rgb2hsv', 'hsv2rgb', 'rgb2xyz', 'xyz2rgb',
-           'rgb2rgbcie', 'rgbcie2rgb', 'rgb2grey', 'rgb2gray', 'gray2rgb',
-           'xyz2lab', 'lab2xyz', 'lab2rgb', 'rgb2lab', 'rgb2hed', 'hed2rgb',
-           'separate_stains', 'combine_stains', 'rgb_from_hed', 'hed_from_rgb',
-           'rgb_from_hdx', 'hdx_from_rgb', 'rgb_from_fgx', 'fgx_from_rgb',
-           'rgb_from_bex', 'bex_from_rgb', 'rgb_from_rbd', 'rbd_from_rgb',
-           'rgb_from_gdx', 'gdx_from_rgb', 'rgb_from_hax', 'hax_from_rgb',
-           'rgb_from_bro', 'bro_from_rgb', 'rgb_from_bpx', 'bpx_from_rgb',
-           'rgb_from_ahx', 'ahx_from_rgb', 'rgb_from_hpx', 'hpx_from_rgb',
-           'is_rgb', 'is_gray']
+__all__ = ['convert_colorspace',
+           'rgb2hsv',
+           'hsv2rgb',
+           'rgb2xyz',
+           'xyz2rgb',
+           'rgb2rgbcie',
+           'rgbcie2rgb',
+           'rgb2grey',
+           'rgb2gray',
+           'gray2rgb',
+           'xyz2lab',
+           'lab2xyz',
+           'lab2rgb',
+           'rgb2lab',
+           'rgb2hed',
+           'hed2rgb',
+           'separate_stains',
+           'combine_stains',
+           'rgb_from_hed',
+           'hed_from_rgb',
+           'rgb_from_hdx',
+           'hdx_from_rgb',
+           'rgb_from_fgx',
+           'fgx_from_rgb',
+           'rgb_from_bex',
+           'bex_from_rgb',
+           'rgb_from_rbd',
+           'rbd_from_rgb',
+           'rgb_from_gdx',
+           'gdx_from_rgb',
+           'rgb_from_hax',
+           'hax_from_rgb',
+           'rgb_from_bro',
+           'bro_from_rgb',
+           'rgb_from_bpx',
+           'bpx_from_rgb',
+           'rgb_from_ahx',
+           'ahx_from_rgb',
+           'rgb_from_hpx',
+           'hpx_from_rgb',
+           'is_rgb',
+           'is_gray']