axes: quick fix to make fill_between_demo work again

efiring · efiring · commit e103fc954e8d · 2010-06-04T02:40:00.000Z
svn path=/trunk/matplotlib/; revision=8371
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -6278,13 +6278,14 @@ def fill_between(self, x, y1, y2=0, where=None, interpolate=False,
 
             if interpolate:
                 def get_interp_point(ind):
-                    x_values = x[ind-1:ind+1]
-                    diff_values = y1[ind-1:ind+1] - y2[ind-1:ind+1]
-                    y1_values = y1[ind-1:ind+1]
+                    im1 = max(ind-1, 0)
+                    x_values = x[im1:ind+1]
+                    diff_values = y1[im1:ind+1] - y2[im1:ind+1]
+                    y1_values = y1[im1:ind+1]
 
                     if len(diff_values) == 2:
                         if np.ma.is_masked(diff_values[1]):
-                            return x[ind-1], y1[ind-1]
+                            return x[im1], y1[im1]
                         elif np.ma.is_masked(diff_values[0]):
                             return x[ind], y1[ind]
 
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -382,10 +382,17 @@ def to_rgba_array(self, c, alpha=None):
                     if (c.ravel() > 1).any() or (c.ravel() < 0).any():
                         raise ValueError(
                             "number in rgba sequence is outside 0-1 range")
-                    # looks like rgba already, nothing to be done; do
-                    # we want to apply alpha here if
-                    # (c[:,3]==1).all() ?
-                    return np.asarray(c, np.float)
+                    result = np.asarray(c, np.float)
+                    if alpha is not None:
+                        if alpha > 1 or alpha < 0:
+                            raise ValueError("alpha must be in 0-1 range")
+                        result[:,3] = alpha
+                    return result
+                    # This alpha operation above is new, and depends
+                    # on higher levels to refrain from setting alpha
+                    # to values other than None unless there is
+                    # intent to override any existing alpha values.
+
             # It must be some other sequence of color specs.
             result = np.zeros((nc, 4), dtype=np.float)
             for i, cc in enumerate(c):
diff --git a/lib/matplotlib/finance.py b/lib/matplotlib/finance.py
@@ -42,7 +42,7 @@ def parse_yahoo_historical(fh, asobject=False, adjusted=True):
 
     where d is a floating poing representation of date, as returned by date2num
 
-    if adjust=True, use adjusted prices
+    if adjusted=True, use adjusted prices
     """
     results = []
 
