From 84bff0860116fe37b139279bff602e4625c87969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= <fboulogne sciunto org>
Date: Thu, 20 Jun 2013 23:08:39 +0200
Subject: [PATCH] fix import testing

---
 skimage/io/tests/test_collection.py | 6 +++++-
 skimage/io/tests/test_colormixer.py | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/skimage/io/tests/test_collection.py b/skimage/io/tests/test_collection.py
index 2bbfefa7..f650daeb 100644
--- a/skimage/io/tests/test_collection.py
+++ b/skimage/io/tests/test_collection.py
@@ -2,7 +2,10 @@ import sys
 import os.path
 
 import numpy as np
-from numpy.testing import *
+from numpy.testing import (assert_raises,
+                           assert_equal,
+                           assert_array_almost_equal,
+                           )
 from numpy.testing.decorators import skipif
 
 from skimage import data_dir
@@ -148,4 +151,5 @@ class TestMultiImage():
 
 
 if __name__ == "__main__":
+    from numpy.testing import run_module_suite
     run_module_suite()
diff --git a/skimage/io/tests/test_colormixer.py b/skimage/io/tests/test_colormixer.py
index b9f362a2..392a7b5b 100644
--- a/skimage/io/tests/test_colormixer.py
+++ b/skimage/io/tests/test_colormixer.py
@@ -1,4 +1,8 @@
-from numpy.testing import *
+from numpy.testing import (assert_array_equal,
+                           assert_almost_equal,
+                           assert_equal,
+                           assert_array_almost_equal,
+                           )
 import numpy as np
 
 import skimage.io._plugins._colormixer as cm
@@ -136,4 +140,5 @@ class TestColorMixer(object):
 
 
 if __name__ == "__main__":
+    from numpy.testing import run_module_suite
     run_module_suite()