SF.net SVN: matplotlib:[7970] branches/v0_99_maint/lib/matplotlib/colors.py

[<ef...@us...>]

Revision: 7970
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7970&view=rev
Author:   efiring
Date:     2009-11-16 23:49:11 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/v0_99_maint/lib/matplotlib/colors.py

Modified: branches/v0_99_maint/lib/matplotlib/colors.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/colors.py	2009-11-15 14:17:14 UTC (rev 7969)
+++ branches/v0_99_maint/lib/matplotlib/colors.py	2009-11-16 23:49:11 UTC (rev 7970)
@@ -765,7 +765,7 @@
         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)
@@ -826,7 +826,7 @@
         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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.