Replace list.extend by star-expansion or other constructs.

anntzer · anntzer · commit 8a730b406d1c · 2019-05-30T17:25:22.000+02:00
... as appropriate.
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -835,13 +835,8 @@ def limit_range_for_scale(self, vmin, vmax):
         return self._scale.limit_range_for_scale(vmin, vmax, self.get_minpos())
 
     def get_children(self):
-        children = [self.label, self.offsetText]
-        majorticks = self.get_major_ticks()
-        minorticks = self.get_minor_ticks()
-
-        children.extend(majorticks)
-        children.extend(minorticks)
-        return children
+        return [self.label, self.offsetText,
+                *self.get_major_ticks(), *self.get_minor_ticks()]
 
     def cla(self):
         'clear the current axis'
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -178,18 +178,16 @@ def pdfRepr(obj):
     # anything, so the caller must ensure that PDF names are
     # represented as Name objects.
     elif isinstance(obj, dict):
-        r = [b"<<"]
-        r.extend([Name(key).pdfRepr() + b" " + pdfRepr(obj[key])
-                  for key in sorted(obj)])
-        r.append(b">>")
-        return fill(r)
+        return fill([
+            b"<<",
+            *[Name(key).pdfRepr() + b" " + pdfRepr(obj[key])
+              for key in sorted(obj)],
+            b">>",
+        ])
 
     # Lists.
     elif isinstance(obj, (list, tuple)):
-        r = [b"["]
-        r.extend([pdfRepr(val) for val in obj])
-        r.append(b"]")
-        return fill(r)
+        return fill([b"[", *[pdfRepr(val) for val in obj], b"]"])
 
     # The null keyword.
     elif obj is None:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -398,11 +398,15 @@ def _get_clip_path(self, clippath, clippath_transform):
         pid = self._clip_paths.get(key)
         if pid is None:
             pid = 'c%x' % len(self._clip_paths)
-            ps_cmd = ['/%s {' % pid]
-            ps_cmd.append(self._convert_path(clippath, clippath_transform,
-                                             simplify=False))
-            ps_cmd.extend(['clip', 'newpath', '} bind def\n'])
-            self._pswriter.write('\n'.join(ps_cmd))
+            clippath_bytes = self._convert_path(
+                clippath, clippath_transform, simplify=False)
+            self._pswriter.write(f"""\
+/{pid} {{
+{clippath_bytes}
+clip
+newpath
+}} bind def
+""")
             self._clip_paths[key] = pid
         return pid
 
@@ -497,11 +501,14 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         for i, (path, transform) in enumerate(self._iter_collection_raw_paths(
                 master_transform, paths, all_transforms)):
             name = 'p%x_%x' % (self._path_collection_id, i)
-            ps_cmd = ['/%s {' % name,
-                      'newpath', 'translate']
-            ps_cmd.append(self._convert_path(path, transform, simplify=False))
-            ps_cmd.extend(['} bind def\n'])
-            write('\n'.join(ps_cmd))
+            path_bytes = self._convert_path(path, transform, simplify=False)
+            write(f"""\
+/{name} {{
+newpath
+translate
+{path_bytes}
+}} bind def
+""")
             path_codes.append(name)
 
         for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -602,8 +602,8 @@ def labels(self, inline, inline_spacing):
                 else:  # If not adding label, keep old path
                     additions.append(linepath)
 
-            # After looping over all segments on a contour, remove old
-            # paths and add new ones if inlining
+            # After looping over all segments on a contour, replace old paths
+            # by new ones if inlining.
             if inline:
                 paths[:] = additions
 
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -536,15 +536,11 @@ def create_artists(self, legend, orig_handle,
                 handle_caplines.append(capline_left)
                 handle_caplines.append(capline_right)
 
-        artists = []
-        artists.extend(handle_barlinecols)
-        artists.extend(handle_caplines)
-        artists.append(legline)
-        artists.append(legline_marker)
-
+        artists = [
+            *handle_barlinecols, *handle_caplines, legline, legline_marker,
+        ]
         for artist in artists:
             artist.set_transform(trans)
-
         return artists
 
 
@@ -634,13 +630,9 @@ def create_artists(self, legend, orig_handle,
                               [bottom, bottom])
         self.update_prop(leg_baseline, baseline, legend)
 
-        artists = leg_stemlines
-        artists.append(leg_baseline)
-        artists.append(leg_markerline)
-
+        artists = [*leg_stemlines, leg_baseline, leg_markerline]
         for artist in artists:
             artist.set_transform(trans)
-
         return artists
 
     def _copy_collection_props(self, legend_handle, orig_handle):
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -1377,11 +1377,9 @@ def get_prop_tup(self, renderer=None):
         want to cache derived information about text (e.g., layouts) and
         need to know if the text has changed.
         """
-        props = [p for p in Text.get_prop_tup(self, renderer=renderer)]
-        props.extend([self._x, self._y, self._dashlength,
-                      self._dashdirection, self._dashrotation, self._dashpad,
-                      self._dashpush])
-        return tuple(props)
+        return (*Text.get_prop_tup(self, renderer=renderer),
+                self._x, self._y, self._dashlength, self._dashdirection,
+                self._dashrotation, self._dashpad, self._dashpush)
 
     def draw(self, renderer):
         """
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -1232,18 +1232,14 @@ def get_tightbbox(self, renderer):
         dpi_cor = renderer.points_to_pixels(1.)
         self.dpi_transform.clear().scale(dpi_cor, dpi_cor)
 
-        bb = []
-
         self._update_ticks(renderer)
-
-        bb.extend(self.major_ticklabels.get_window_extents(renderer))
-        bb.extend(self.minor_ticklabels.get_window_extents(renderer))
-
         self._update_label(renderer)
-
-        bb.append(self.label.get_window_extent(renderer))
-        bb.append(self.offsetText.get_window_extent(renderer))
-
+        bb = [
+            *self.major_ticklabels.get_window_extents(renderer),
+            *self.minor_ticklabels.get_window_extents(renderer),
+            self.label.get_window_extent(renderer),
+            self.offsetText.get_window_extent(renderer),
+        ]
         bb = [b for b in bb if b and (b.width != 0 or b.height != 0)]
         if bb:
             _bbox = Bbox.union(bb)
diff --git a/lib/mpl_toolkits/axisartist/floating_axes.py b/lib/mpl_toolkits/axisartist/floating_axes.py
@@ -287,11 +287,9 @@ def _update_grid(self, x1, y1, x2, y2):
     def get_gridlines(self, which="major", axis="both"):
         grid_lines = []
         if axis in ["both", "x"]:
-            for gl in self.grid_info["lon_lines"]:
-                grid_lines.extend([gl])
+            grid_lines.extend(self.grid_info["lon_lines"])
         if axis in ["both", "y"]:
-            for gl in self.grid_info["lat_lines"]:
-                grid_lines.extend([gl])
+            grid_lines.extend(self.grid_info["lat_lines"])
         return grid_lines
 
     def get_boundary(self):
