Replace full list evaluations with more efficient calls

QuLogic · QuLogic · commit dbad6cf50ed7 · 2024-07-22T15:45:07.000-04:00
- UP027: Replace unpacked list comprehensions with generator
  expressions; these are supposedly more efficient since no temporary
  list is created.
- RUF015: Replace accessing the first element of an evaluated list with
  `next(iter(...))`, avoiding the temporary list.
- RUF017: Replace quadratic `sum(list of list, [])` with faster
  `functools.reduce` implementation.
diff --git a/lib/matplotlib/_docstring.py b/lib/matplotlib/_docstring.py
@@ -82,8 +82,8 @@ def __missing__(self, key):
         name = key[:-len(":kwdoc")]
         from matplotlib.artist import Artist, kwdoc
         try:
-            cls, = [cls for cls in _api.recursive_subclasses(Artist)
-                    if cls.__name__ == name]
+            cls, = (cls for cls in _api.recursive_subclasses(Artist)
+                    if cls.__name__ == name)
         except ValueError as e:
             raise KeyError(key) from e
         return self.setdefault(key, kwdoc(cls))
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -376,7 +376,7 @@ def _get_info(self, fontname: str, font_class: str, sym: str, fontsize: float,
         font.set_size(fontsize, dpi)
         glyph = font.load_char(num, flags=self.load_glyph_flags)
 
-        xmin, ymin, xmax, ymax = [val/64.0 for val in glyph.bbox]
+        xmin, ymin, xmax, ymax = (val / 64 for val in glyph.bbox)
         offset = self._get_offset(font, glyph, fontsize, dpi)
         metrics = FontMetrics(
             advance = glyph.linearHoriAdvance/65536.0,
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -1,10 +1,11 @@
 from collections import namedtuple
 import contextlib
-from functools import cache, wraps
+from functools import cache, reduce, wraps
 import inspect
 from inspect import Signature, Parameter
 import logging
 from numbers import Number, Real
+import operator
 import re
 import warnings
 
@@ -1290,7 +1291,8 @@ def matchfunc(x):
             raise ValueError('match must be None, a matplotlib.artist.Artist '
                              'subclass, or a callable')
 
-        artists = sum([c.findobj(matchfunc) for c in self.get_children()], [])
+        artists = reduce(operator.iadd,
+                         [c.findobj(matchfunc) for c in self.get_children()], [])
         if include_self and matchfunc(self):
             artists.append(self)
         return artists
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -6000,7 +6000,7 @@ def _pcolorargs(self, funcname, *args, shading='auto', **kwargs):
             # unit conversion allows e.g. datetime objects as axis values
             X, Y = args[:2]
             X, Y = self._process_unit_info([("x", X), ("y", Y)], kwargs)
-            X, Y = [cbook.safe_masked_invalid(a, copy=True) for a in [X, Y]]
+            X, Y = (cbook.safe_masked_invalid(a, copy=True) for a in [X, Y])
 
             if funcname == 'pcolormesh':
                 if np.ma.is_masked(X) or np.ma.is_masked(Y):
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -29,7 +29,7 @@
 # allows all Line2D kwargs.
 _line_inspector = martist.ArtistInspector(mlines.Line2D)
 _line_param_names = _line_inspector.get_setters()
-_line_param_aliases = [list(d)[0] for d in _line_inspector.aliasd.values()]
+_line_param_aliases = [next(iter(d)) for d in _line_inspector.aliasd.values()]
 _gridline_param_names = ['grid_' + name
                          for name in _line_param_names + _line_param_aliases]
 
@@ -728,8 +728,8 @@ def _get_shared_axis(self):
 
     def _get_axis_name(self):
         """Return the axis name."""
-        return [name for name, axis in self.axes._axis_map.items()
-                if axis is self][0]
+        return next(name for name, axis in self.axes._axis_map.items()
+                    if axis is self)
 
     # During initialization, Axis objects often create ticks that are later
     # unused; this turns out to be a very slow step.  Instead, use a custom
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -483,7 +483,7 @@ def blit(self, bbox=None):
         if bbox is None and self.figure:
             bbox = self.figure.bbox  # Blit the entire canvas if bbox is None.
         # repaint uses logical pixels, not physical pixels like the renderer.
-        l, b, w, h = [int(pt / self.device_pixel_ratio) for pt in bbox.bounds]
+        l, b, w, h = (int(pt / self.device_pixel_ratio) for pt in bbox.bounds)
         t = b + h
         self.repaint(l, self.rect().height() - t, w, h)
 
@@ -504,7 +504,7 @@ def drawRectangle(self, rect):
         # Draw the zoom rectangle to the QPainter.  _draw_rect_callback needs
         # to be called at the end of paintEvent.
         if rect is not None:
-            x0, y0, w, h = [int(pt / self.device_pixel_ratio) for pt in rect]
+            x0, y0, w, h = (int(pt / self.device_pixel_ratio) for pt in rect)
             x1 = x0 + w
             y1 = y0 + h
             def _draw_rect_callback(painter):
diff --git a/lib/matplotlib/backends/backend_wx.py b/lib/matplotlib/backends/backend_wx.py
@@ -1197,8 +1197,8 @@ def _get_tool_pos(self, tool):
         ``ToolBar.GetToolPos`` is not useful because wx assigns the same Id to
         all Separators and StretchableSpaces.
         """
-        pos, = [pos for pos in range(self.ToolsCount)
-                if self.GetToolByPos(pos) == tool]
+        pos, = (pos for pos in range(self.ToolsCount)
+                if self.GetToolByPos(pos) == tool)
         return pos
 
     def add_toolitem(self, name, group, position, image_file, description,
diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py
@@ -54,7 +54,7 @@ def get_intersection(cx1, cy1, cos_t1, sin_t1,
     # rhs_inverse
     a_, b_ = d, -b
     c_, d_ = -c, a
-    a_, b_, c_, d_ = [k / ad_bc for k in [a_, b_, c_, d_]]
+    a_, b_, c_, d_ = (k / ad_bc for k in [a_, b_, c_, d_])
 
     x = a_ * line1_rhs + b_ * line2_rhs
     y = c_ * line1_rhs + d_ * line2_rhs
diff --git a/lib/matplotlib/quiver.py b/lib/matplotlib/quiver.py
@@ -424,13 +424,13 @@ def _parse_args(*args, caller_name='function'):
         X = X.ravel()
         Y = Y.ravel()
         if len(X) == nc and len(Y) == nr:
-            X, Y = [a.ravel() for a in np.meshgrid(X, Y)]
+            X, Y = (a.ravel() for a in np.meshgrid(X, Y))
         elif len(X) != len(Y):
             raise ValueError('X and Y must be the same size, but '
                              f'X.size is {X.size} and Y.size is {Y.size}.')
     else:
         indexgrid = np.meshgrid(np.arange(nc), np.arange(nr))
-        X, Y = [np.ravel(a) for a in indexgrid]
+        X, Y = (np.ravel(a) for a in indexgrid)
     # Size validation for U, V, C is left to the set_UVC method.
     return X, Y, U, V, C
 
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -3086,10 +3086,10 @@ def test_log_scales():
     ax.set_yscale('log', base=5.5)
     ax.invert_yaxis()
     ax.set_xscale('log', base=9.0)
-    xticks, yticks = [
+    xticks, yticks = (
         [(t.get_loc(), t.label1.get_text()) for t in axis._update_ticks()]
         for axis in [ax.xaxis, ax.yaxis]
-    ]
+    )
     assert xticks == [
         (1.0, '$\\mathdefault{9^{0}}$'),
         (9.0, '$\\mathdefault{9^{1}}$'),
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -183,8 +183,8 @@ def test_addfont_as_path():
     path = Path(__file__).parent / font_test_file
     try:
         fontManager.addfont(path)
-        added, = [font for font in fontManager.ttflist
-                  if font.fname.endswith(font_test_file)]
+        added, = (font for font in fontManager.ttflist
+                  if font.fname.endswith(font_test_file))
         fontManager.ttflist.remove(added)
     finally:
         to_remove = [font for font in fontManager.ttflist
diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
@@ -270,7 +270,7 @@ def test_short_long_accents(fig_test, fig_ref):
     short_accs = [s for s in acc_map if len(s) == 1]
     corresponding_long_accs = []
     for s in short_accs:
-        l, = [l for l in acc_map if len(l) > 1 and acc_map[l] == acc_map[s]]
+        l, = (l for l in acc_map if len(l) > 1 and acc_map[l] == acc_map[s])
         corresponding_long_accs.append(l)
     fig_test.text(0, .5, "$" + "".join(rf"\{s}a" for s in short_accs) + "$")
     fig_ref.text(
diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py
@@ -62,7 +62,7 @@ def plot_directive_file(num):
         # This is always next to the doctree dir.
         return doctree_dir.parent / 'plot_directive' / f'some_plots-{num}.png'
 
-    range_10, range_6, range_4 = [plot_file(i) for i in range(1, 4)]
+    range_10, range_6, range_4 = (plot_file(i) for i in range(1, 4))
     # Plot 5 is range(6) plot
     assert filecmp.cmp(range_6, plot_file(5))
     # Plot 7 is range(4) plot
diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py
@@ -921,7 +921,7 @@ def test_annotate_offset_fontsize():
                         fontsize='10',
                         xycoords='data',
                         textcoords=text_coords[i]) for i in range(2)]
-    points_coords, fontsize_coords = [ann.get_window_extent() for ann in anns]
+    points_coords, fontsize_coords = (ann.get_window_extent() for ann in anns)
     fig.canvas.draw()
     assert str(points_coords) == str(fontsize_coords)
 
diff --git a/lib/matplotlib/tests/test_type1font.py b/lib/matplotlib/tests/test_type1font.py
@@ -141,11 +141,11 @@ def test_overprecision():
     font = t1f.Type1Font(filename)
     slanted = font.transform({'slant': .167})
     lines = slanted.parts[0].decode('ascii').splitlines()
-    matrix, = [line[line.index('[')+1:line.index(']')]
-               for line in lines if '/FontMatrix' in line]
-    angle, = [word
+    matrix, = (line[line.index('[')+1:line.index(']')]
+               for line in lines if '/FontMatrix' in line)
+    angle, = (word
               for line in lines if '/ItalicAngle' in line
-              for word in line.split() if word[0] in '-0123456789']
+              for word in line.split() if word[0] in '-0123456789')
     # the following used to include 0.00016700000000000002
     assert matrix == '0.001 0 0.000167 0.001 0 0'
     # and here we had -9.48090361795083
diff --git a/lib/matplotlib/tests/test_widgets.py b/lib/matplotlib/tests/test_widgets.py
@@ -1,5 +1,6 @@
 import functools
 import io
+import operator
 from unittest import mock
 
 import matplotlib as mpl
@@ -1573,7 +1574,7 @@ def test_polygon_selector_remove(idx, draw_bounding_box):
     # Remove the extra point
     event_sequence.append(polygon_remove_vertex(200, 200))
     # Flatten list of lists
-    event_sequence = sum(event_sequence, [])
+    event_sequence = functools.reduce(operator.iadd, event_sequence, [])
     check_polygon_selector(event_sequence, verts, 2,
                            draw_bounding_box=draw_bounding_box)
 
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
@@ -508,10 +508,10 @@ def test_scatter3d_sorting(fig_ref, fig_test, depthshade):
     linewidths[0::2, 0::2] = 5
     linewidths[1::2, 1::2] = 5
 
-    x, y, z, sizes, facecolors, edgecolors, linewidths = [
+    x, y, z, sizes, facecolors, edgecolors, linewidths = (
         a.flatten()
         for a in [x, y, z, sizes, facecolors, edgecolors, linewidths]
-    ]
+    )
 
     ax_ref = fig_ref.add_subplot(projection='3d')
     sets = (np.unique(a) for a in [sizes, facecolors, edgecolors, linewidths])
diff --git a/tools/generate_matplotlibrc.py b/tools/generate_matplotlibrc.py
@@ -20,9 +20,9 @@
 backend = sys.argv[3]
 
 template_lines = input.read_text(encoding="utf-8").splitlines(True)
-backend_line_idx, = [  # Also asserts that there is a single such line.
+backend_line_idx, = (  # Also asserts that there is a single such line.
     idx for idx, line in enumerate(template_lines)
-    if "#backend:" in line]
+    if "#backend:" in line)
 template_lines[backend_line_idx] = (
     f"#backend: {backend}\n" if backend not in ['', 'auto'] else "##backend: Agg\n")
 output.write_text("".join(template_lines), encoding="utf-8")
