pep8 compliance

matplotlib · dmcdougall · Jan 27, 2013 · Jan 10, 2013 · Jan 10, 2013 · Jan 16, 2013
commit b21b34887cd4602474b064bb9e489e6c40e1b5b4
diff --git a/lib/matplotlib/stackplot.py b/lib/matplotlib/stackplot.py
@@ -56,21 +56,21 @@ def stackplot(axes, x, *args, **kwargs):

    baseline = kwargs.pop('baseline', 'zero')
    # Assume data passed has not been 'stacked', so stack it here.
-    y_stack = np.cumsum(y, axis=0)
+    stack = np.cumsum(y, axis=0)

    r = []
    if baseline == 'zero':
        first_line = 0.

    elif baseline == 'sym':
-        first_line =  -np.sum(y, 0) * 0.5
-        y_stack += first_line[None, :]
+        first_line = -np.sum(y, 0) * 0.5
+        stack += first_line[None, :]

    elif baseline == 'wiggle':
        m = y.shape[0]
        first_line = (y * (m - 0.5 - np.arange(0, m)[:, None])).sum(0)
        first_line /= -m
-        y_stack += first_line
+        stack += first_line

    elif baseline == 'weighted_wiggle':
        #TODO: Vectorize this stuff.
@@ -83,29 +83,30 @@ def stackplot(axes, x, *args, **kwargs):
            for j in range(m):
                if i == 0:
                    increase = y[j, i]
-                    moveUp = 0.5
+                    move_up = 0.5
                else:
-                    belowSize = 0.5 * y[j, i]
+                    below_size = 0.5 * y[j, i]
                    for k in range(j + 1, m):
-                        belowSize += y[k, i]
+                        below_size += y[k, i]
                    increase = y[j, i] - y[j, i - 1]
-                    moveUp = belowSize / total[i]
-                center[i] += (moveUp - 0.5) * increase
+                    move_up = below_size / total[i]
+                center[i] += (move_up - 0.5) * increase
        first_line = center - 0.5 * total
-        y_stack += first_line
+        stack += first_line
    else:
        errstr = "Baseline method %s not recognised. " % baseline
        errstr += "Expected 'zero', 'sym', 'wiggle' or 'weighted_wiggle'"
        raise ValueError(errstr)

    # Color between x = 0 and the first array.
-    r.append(axes.fill_between(x, first_line, y_stack[0,:],
+    r.append(axes.fill_between(x, first_line, stack[0, :],
                               facecolor=axes._get_lines.color_cycle.next(),
                               **kwargs))

    # Color between array i-1 and array i
-    for i in xrange(len(y)-1):
-        r.append(axes.fill_between(x, y_stack[i,: ], y_stack[i + 1, :],
-                                   facecolor=axes._get_lines.color_cycle.next(),
+    for i in xrange(len(y) - 1):
+        color = axes._get_lines.color_cycle.next()
+        r.append(axes.fill_between(x, stack[i, :], stack[i + 1, :],
+                                   facecolor= color,
                                   **kwargs))
    return r