More pep8 fixes - deleted unused variables

NelleV · NelleV · commit 8bb02897a5e4 · 2012-10-09T10:11:22.000+02:00
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -778,8 +778,11 @@ def __init__(self, xranges, yrange, **kwargs):
         """
         ymin, ywidth = yrange
         ymax = ymin + ywidth
-        verts = [[(xmin, ymin), (xmin, ymax), (xmin + xwidth, ymax), (
-            xmin + xwidth, ymin), (xmin, ymin)] for xmin, xwidth in xranges]
+        verts = [[(xmin, ymin),
+                  (xmin, ymax),
+                  (xmin + xwidth, ymax),
+                  (xmin + xwidth, ymin),
+                  (xmin, ymin)] for xmin, xwidth in xranges]
         PolyCollection.__init__(self, verts, **kwargs)
 
     @staticmethod
@@ -1370,12 +1373,12 @@ def convert_mesh_to_paths(meshWidth, meshHeight, coordinates):
             c = coordinates
 
         points = np.concatenate((
-            c[0:-1, 0:-1],
-            c[0:-1, 1:],
-            c[1:, 1:],
-            c[1:, 0:-1],
-            c[0:-1, 0:-1]
-        ), axis=2)
+                    c[0:-1, 0:-1],
+                    c[0:-1, 1:],
+                    c[1:, 1:],
+                    c[1:, 0:-1],
+                    c[0:-1, 0:-1]
+                ), axis=2)
         points = points.reshape((meshWidth * meshHeight, 5, 2))
         return [Path(x) for x in points]
 
@@ -1385,40 +1388,38 @@ def convert_mesh_to_triangles(self, meshWidth, meshHeight, coordinates):
         with its own color.  This is useful for experiments using
         `draw_qouraud_triangle`.
         """
-        Path = mpath.Path
-
         if ma.isMaskedArray(coordinates):
             p = coordinates.data
         else:
             p = coordinates
 
-        p_a = p[0:-1, 0:-1]
-        p_b = p[0:-1, 1:]
+        p_a = p[:-1, :-1]
+        p_b = p[:-1, 1:]
         p_c = p[1:, 1:]
-        p_d = p[1:, 0:-1]
+        p_d = p[1:, :-1]
         p_center = (p_a + p_b + p_c + p_d) / 4.0
 
         triangles = np.concatenate((
-            p_a, p_b, p_center,
-            p_b, p_c, p_center,
-            p_c, p_d, p_center,
-            p_d, p_a, p_center,
-        ), axis=2)
+                p_a, p_b, p_center,
+                p_b, p_c, p_center,
+                p_c, p_d, p_center,
+                p_d, p_a, p_center,
+            ), axis=2)
         triangles = triangles.reshape((meshWidth * meshHeight * 4, 3, 2))
 
         c = self.get_facecolor().reshape((meshHeight + 1, meshWidth + 1, 4))
-        c_a = c[0:-1, 0:-1]
-        c_b = c[0:-1, 1:]
+        c_a = c[:-1, :-1]
+        c_b = c[:-1, 1:]
         c_c = c[1:, 1:]
-        c_d = c[1:, 0:-1]
+        c_d = c[1:, :-1]
         c_center = (c_a + c_b + c_c + c_d) / 4.0
 
         colors = np.concatenate((
-            c_a, c_b, c_center,
-            c_b, c_c, c_center,
-            c_c, c_d, c_center,
-            c_d, c_a, c_center,
-        ), axis=2)
+                        c_a, c_b, c_center,
+                        c_b, c_c, c_center,
+                        c_c, c_d, c_center,
+                        c_d, c_a, c_center,
+                    ), axis=2)
         colors = colors.reshape((meshWidth * meshHeight * 4, 3, 4))
 
         return triangles, colors
