Merged revisions 7970 via svnmerge from

efiring · efiring · commit a8aa115e8fad · 2009-11-16T23:53:13.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7970 | efiring | 2009-11-16 13:49:11 -1000 (Mon, 16 Nov 2009) | 4 lines Fix Normalize bug: ensure scalar output for scalar input. This bug was causing a bug in clabel with a single contour level, as reported by Brendan Arnold. ........ svn path=/trunk/matplotlib/; revision=7971
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -794,7 +794,7 @@ def __call__(self, value, clip=None):
         if vmin > vmax:
             raise ValueError("minvalue must be less than or equal to maxvalue")
         elif vmin==vmax:
-            return 0.0 * val
+            result = 0.0 * val
         else:
             if clip:
                 mask = ma.getmask(val)
@@ -855,7 +855,7 @@ def __call__(self, value, clip=None):
         elif vmin<=0:
             raise ValueError("values must all be positive")
         elif vmin==vmax:
-            return 0.0 * val
+            result = 0.0 * val
         else:
             if clip:
                 mask = ma.getmask(val)
