From 3d963649fce1f79059d26c41ef632fa8cd87c92f Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Thu, 16 Jul 2015 07:56:14 -0500
Subject: [PATCH] Use a less-invasive approach

---
 skimage/__init__.py                      |  7 -------
 skimage/io/_plugins/matplotlib_plugin.py |  7 +++----
 skimage/io/tests/test_mpl_imshow.py      | 18 +++++++++---------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/skimage/__init__.py b/skimage/__init__.py
index 8579c5fe..e9216950 100644
--- a/skimage/__init__.py
+++ b/skimage/__init__.py
@@ -61,8 +61,6 @@ import imp
 import functools
 import warnings
 from .util.dtype import *
-from .util.colormap import viridis
-from matplotlib.cm import register_cmap
 
 pkg_dir = osp.abspath(osp.dirname(__file__))
 data_dir = osp.join(pkg_dir, 'data')
@@ -101,11 +99,6 @@ else:
             return 1
 
 
-# register the viridis colormap
-register_cmap('viridis', viridis)
-del register_cmap, viridis
-
-
 # do not use `test` as function name as this leads to a recursion problem with
 # the nose test suite
 test = _test
diff --git a/skimage/io/_plugins/matplotlib_plugin.py b/skimage/io/_plugins/matplotlib_plugin.py
index 421ddc6d..e9fd8b71 100644
--- a/skimage/io/_plugins/matplotlib_plugin.py
+++ b/skimage/io/_plugins/matplotlib_plugin.py
@@ -4,11 +4,10 @@ import warnings
 import matplotlib.pyplot as plt
 from ...util import dtype as dtypes
 from ...exposure import is_low_contrast
-from ..._shared._warnings import all_warnings
+from ..util.colormap import viridis
 
-
-_default_colormap = 'viridis'
-_nonstandard_colormap = 'viridis'
+_default_colormap = 'gray'
+_nonstandard_colormap = viridis
 _diverging_colormap = 'RdBu'
 
 
diff --git a/skimage/io/tests/test_mpl_imshow.py b/skimage/io/tests/test_mpl_imshow.py
index 005e4f9e..9b814f57 100644
--- a/skimage/io/tests/test_mpl_imshow.py
+++ b/skimage/io/tests/test_mpl_imshow.py
@@ -44,28 +44,28 @@ def n_subplots(ax_im):
 def test_uint8():
     plt.figure()
     ax_im = io.imshow(im8)
-    assert ax_im.cmap.name == 'viridis'
+    assert ax_im.cmap.name == 'gray'
     assert ax_im.get_clim() == (0, 255)
-    assert n_subplots(ax_im) == 2
-    assert ax_im.colorbar is not None
+    assert n_subplots(ax_im) == 1
+    assert ax_im.colorbar is None
 
 
 def test_uint16():
     plt.figure()
     ax_im = io.imshow(im16)
-    assert ax_im.cmap.name == 'viridis'
+    assert ax_im.cmap.name == 'gray'
     assert ax_im.get_clim() == (0, 65535)
-    assert n_subplots(ax_im) == 2
-    assert ax_im.colorbar is not None
+    assert n_subplots(ax_im) == 1
+    assert ax_im.colorbar is None
 
 
 def test_float():
     plt.figure()
     ax_im = io.imshow(imf)
-    assert ax_im.cmap.name == 'viridis'
+    assert ax_im.cmap.name == 'gray'
     assert ax_im.get_clim() == (0, 1)
-    assert n_subplots(ax_im) == 2
-    assert ax_im.colorbar is not None
+    assert n_subplots(ax_im) == 1
+    assert ax_im.colorbar is None
 
 
 def test_low_dynamic_range():