Merge pull request #5109 from Cadair/master

WeatherGod · WeatherGod · commit 2706edbd9cb5 · 2015-09-21T11:01:12.000-04:00
Fix for bug in set_cmap in NonUniformImage
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -847,12 +847,12 @@ def set_filterrad(self, s):
     def set_norm(self, norm):
         if self._A is not None:
             raise RuntimeError('Cannot change colors after loading data')
-        super(NonUniformImage, self).set_norm(self, norm)
+        super(NonUniformImage, self).set_norm(norm)
 
     def set_cmap(self, cmap):
         if self._A is not None:
             raise RuntimeError('Cannot change colors after loading data')
-        super(NonUniformImage, self).set_cmap(self, cmap)
+        super(NonUniformImage, self).set_cmap(cmap)
 
 
 class PcolorImage(martist.Artist, cm.ScalarMappable):
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -6,7 +6,7 @@
 import numpy as np
 
 from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup
-from matplotlib.image import BboxImage, imread
+from matplotlib.image import BboxImage, imread, NonUniformImage
 from matplotlib.transforms import Bbox
 from matplotlib import rcParams
 import matplotlib.pyplot as plt
@@ -441,6 +441,18 @@ def test_zoom_and_clip_upper_origin():
     ax.set_xlim(-0.5, 2.0)
 
 
+@cleanup
+def test_nonuniformimage_setcmap():
+    ax = plt.gca()
+    im = NonUniformImage(ax)
+    im.set_cmap('Blues')
+
+@cleanup
+def test_nonuniformimage_setnorm():
+    ax = plt.gca()
+    im = NonUniformImage(ax)
+    im.set_norm(plt.Normalize())
+
 if __name__=='__main__':
     import nose
     nose.runmodule(argv=['-s','--with-doctest'], exit=False)
