Merge pull request matplotlib#12883 from rth/list-comprehension

anntzer · web-flow · commit 6d91ed96643b · 2018-11-26T09:45:25.000+01:00
MAINT Use list comprehension
diff --git a/lib/matplotlib/_pylab_helpers.py b/lib/matplotlib/_pylab_helpers.py
@@ -113,10 +113,7 @@ def set_active(cls, manager):
         Make the figure corresponding to *manager* the active one.
         """
         oldQue = cls._activeQue[:]
-        cls._activeQue = []
-        for m in oldQue:
-            if m != manager:
-                cls._activeQue.append(m)
+        cls._activeQue = [m for m in oldQue if m != manager]
         cls._activeQue.append(manager)
         cls.figs[manager.num] = manager
 
diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
@@ -128,10 +128,9 @@ def ensure_not_dirty(self):
 
     def reset_available_writers(self):
         """Reset the available state of all registered writers"""
-        self.avail = {}
-        for name, writerClass in self._registered.items():
-            if writerClass.isAvailable():
-                self.avail[name] = writerClass
+        self.avail = {name: writerClass
+                      for name, writerClass in self._registered.items()
+                      if writerClass.isAvailable()}
         self._dirty = False
 
     def list(self):
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -227,10 +227,10 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         recommended to use those generators, so that changes to the
         behavior of :meth:`draw_path_collection` can be made globally.
         """
-        path_ids = []
-        for path, transform in self._iter_collection_raw_paths(
-                master_transform, paths, all_transforms):
-            path_ids.append((path, transforms.Affine2D(transform)))
+        path_ids = [
+            (path, transforms.Affine2D(transform))
+            for path, transform in self._iter_collection_raw_paths(
+                    master_transform, paths, all_transforms)]
 
         for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
                 gc, master_transform, all_transforms, path_ids, offsets,
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -291,10 +291,10 @@ def draw_path_collection(
             offsetTrans, facecolors, edgecolors, linewidths, linestyles,
             antialiaseds, urls, offset_position):
 
-        path_ids = []
-        for path, transform in self._iter_collection_raw_paths(
-                master_transform, paths, all_transforms):
-            path_ids.append((path, Affine2D(transform)))
+        path_ids = [
+            (path, Affine2D(transform))
+            for path, transform in self._iter_collection_raw_paths(
+                    master_transform, paths, all_transforms)]
 
         reuse_key = None
         grouped_draw = []
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -1097,10 +1097,7 @@ def print_figure_impl(fh):
                         ps_renderer.used_characters.values():
                     if len(chars):
                         font = get_font(font_filename)
-                        glyph_ids = []
-                        for c in chars:
-                            gind = font.get_char_index(c)
-                            glyph_ids.append(gind)
+                        glyph_ids = [font.get_char_index(c) for c in chars]
 
                         fonttype = rcParams['ps.fonttype']
 
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1439,10 +1439,8 @@ def updateAxes(self, maxAxis):
 
     def getActiveAxes(self):
         """Return a list of the selected axes."""
-        active = []
-        for i in range(len(self._axisId)):
-            if self._menu.IsChecked(self._axisId[i]):
-                active.append(i)
+        active = [idx for idx, ax_id in enumerate(self._axisId)
+                  if self._menu.IsChecked(ax_id)]
         return active
 
     def updateButtonText(self, lst):
diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
@@ -1402,10 +1402,7 @@ def get_positions(self):
         '''
         segments = self.get_segments()
         pos = 0 if self.is_horizontal() else 1
-        positions = []
-        for segment in segments:
-            positions.append(segment[0, pos])
-        return positions
+        return [segment[0, pos] for segment in self.get_segments()]
 
     def set_positions(self, positions):
         '''
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -606,10 +606,8 @@ def create_artists(self, legend, orig_handle,
         leg_markerline = Line2D(xdata_marker, ydata[:len(xdata_marker)])
         self.update_prop(leg_markerline, markerline, legend)
 
-        leg_stemlines = []
-        for thisx, thisy in zip(xdata_marker, ydata):
-            l = Line2D([thisx, thisx], [bottom, thisy])
-            leg_stemlines.append(l)
+        leg_stemlines = [Line2D([x, x], [bottom, y])
+                         for x, y in zip(xdata_marker, ydata)]
 
         for lm, m in zip(leg_stemlines, stemlines):
             self.update_prop(lm, m, legend)
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -189,14 +189,11 @@ def path_to_3d_segment_with_codes(path, zs=0, zdir='z'):
     """Convert a path to a 3D segment with path codes."""
 
     zs = np.broadcast_to(zs, len(path))
-    seg = []
-    codes = []
     pathsegs = path.iter_segments(simplify=False, curves=False)
-    for (((x, y), code), z) in zip(pathsegs, zs):
-        seg.append((x, y, z))
-        codes.append(code)
+    seg_codes = [((x, y, z), code) for ((x, y), code), z in zip(pathsegs, zs)]
+    seg, codes = zip(*seg_codes)
     seg3d = [juggle_axes(x, y, z, zdir) for (x, y, z) in seg]
-    return seg3d, codes
+    return seg3d, list(codes)
 
 
 def paths_to_3d_segments_with_codes(paths, zs=0, zdir='z'):
@@ -205,13 +202,10 @@ def paths_to_3d_segments_with_codes(paths, zs=0, zdir='z'):
     """
 
     zs = np.broadcast_to(zs, len(paths))
-    segments = []
-    codes_list = []
-    for path, pathz in zip(paths, zs):
-        segs, codes = path_to_3d_segment_with_codes(path, pathz, zdir)
-        segments.append(segs)
-        codes_list.append(codes)
-    return segments, codes_list
+    segments_codes = [path_to_3d_segment_with_codes(path, pathz, zdir)
+                      for path, pathz in zip(paths, zs)]
+    segments, codes = zip(*segments_codes)
+    return list(segments), list(codes)
 
 
 class Line3DCollection(LineCollection):
