Merge pull request #1338 from blink1073/imshow-fixes

Update Matplotlib plugin docstring.  Create test module setup function.

skimage/io/_plugins/matplotlib_plugin.py

@@ -113,7 +113,7 @@ def imshow(im, *args, **kwargs):
     """Show the input image and return the current axes.
 
     By default, the image is displayed in greyscale, rather than
-    the matplotlib default colormap, 'jet'.
+    the matplotlib default colormap.
 
     Images are assumed to have standard range for their type. For
     example, if a floating point image has values in [0, 0.5], the

skimage/io/tests/test_mpl_imshow.py

@@ -6,8 +6,8 @@ from skimage._shared._warnings import expected_warnings
 import matplotlib.pyplot as plt
 
 
-io.use_plugin('matplotlib', 'imshow')
-
+def setup():
+    io.reset_plugins()
 
 # test images. Note that they don't have their full range for their dtype,
 # but we still expect the display range to equal the full dtype range.