Minor optimizations by using comprehensions

Author: cclauss

.pre-commit-config.yaml

@@ -49,7 +49,9 @@ repos:
     hooks:
       - id: ruff
         args: [
-          --target-version, py37,
           --exclude, setup.py,
-          --extend-ignore, "E401,E402,E701,E721,E722,E731,E741,F401,F403,F405,F821,F841"
+          --extend-ignore, "E401,E402,E701,E721,E722,E731,E741,F401,F403,F405,F821,F841",
+          --extend-select, "ASYNC,C4,PERF,W",
+          # --line-length, "159",
+          --target-version, py37,
         ]

buildconfig/config.py

@@ -71,23 +71,21 @@ def prepdep(dep, basepath):
             dep.found = 1
         return
 
-    incs = []
-    lids = []
     IPREFIX = ' -I$(BASE)' if basepath else ' -I'
     LPREFIX = ' -L$(BASE)' if basepath else ' -L'
     startind = len(basepath) if basepath else 0
+    incs = []
     if dep.inc_dir:
         if isinstance(dep.inc_dir, str):
-            incs.append(IPREFIX+dep.inc_dir[startind:])
+            incs = [IPREFIX+dep.inc_dir[startind:]]
         else:
-            for dir in dep.inc_dir:
-                incs.append(IPREFIX+dir[startind:])
+            incs = [IPREFIX+dir[startind:] for dir in dep.inc_dir]
+    lids = []
     if dep.lib_dir:
         if isinstance(dep.lib_dir, str):
-            lids.append(LPREFIX+dep.lib_dir[startind:])
+            lids = [LPREFIX+dep.lib_dir[startind:]]
         else:
-            for dir in dep.lib_dir:
-                lids.append(LPREFIX+dir[startind:])
+            lids = [LPREFIX+dir[startind:]for dir in dep.lib_dir]
     libs = ''
     for lib in dep.libs:
         libs += ' -l' + lib
@@ -231,7 +229,7 @@ def main(auto=False):
             shutil.copyfile(setup_path, backup_path)
         except Exception as e:
             logging.error(f"Failed to backup 'Setup' file: {e}")
-        
+
 
     deps = CFG.main(**kwds, auto_config=auto)
     if '-conan' in sys.argv:

buildconfig/config_unix.py

@@ -143,7 +143,7 @@ def main(auto_config=False):
     origincdirs = ['/include', '/include/SDL2']
     origlibdirs = ['/lib', '/lib64', '/X11R6/lib']
 
-    # If we are on a debian based system, we also need to handle 
+    # If we are on a debian based system, we also need to handle
     # /lib/<multiarch-tuple>
     # We have a few commands to get the correct <multiarch-tuple>, we try those
     # one by one till we get something that works

buildconfig/stubs/gen_stubs.py

@@ -118,7 +118,7 @@ def Overlay(format: int, size: Tuple[int, int]) -> NoReturn: ...
     for mod, items in pygame_all_imports.items():
         if len(items) <= 4:
             # try to write imports in a single line if it can fit the line limit
-            import_items = map(lambda string: f"{string} as {string}", items)
+            import_items = (f"{string} as {string}" for string in items)
             import_line = f"\nfrom {mod} import {', '.join(import_items)}"
             if len(import_line) <= 88:
                 f.write(import_line)

buildconfig/stubs/pygame/sprite.pyi

@@ -80,7 +80,7 @@ class DirtySprite(_SupportsDirtySprite):
     _layer: int
     def _set_visible(self, val: int) -> None: ...
     def _get_visible(self) -> int: ...
-    
+
 class WeakDirtySprite(WeakSprite, DirtySprite):
     ...
 

docs/reST/ref/code_examples/cursors_module_example.py

@@ -15,7 +15,7 @@
 )
 
 # create a color cursor
-surf = pg.Surface((40, 40)) # you could also load an image 
+surf = pg.Surface((40, 40)) # you could also load an image
 surf.fill((120, 50, 50))        # and use that as your surface
 color = pg.cursors.Cursor((20, 20), surf)
 

examples/font_viewer.py

@@ -70,14 +70,11 @@ def get_font_list(self):
         path = ""
         if len(sys.argv) > 1 and os.path.exists(sys.argv[1]):
             path = os.path.join(sys.argv[1], "")
-        fonts = []
         if os.path.exists(path):
-            # this list comprehension could replace the following loop
-            # fonts = [f in os.listdir(path) if f.endswith('.ttf')]
-            for font in os.listdir(path):
-                if font.endswith(".ttf"):
-                    fonts.append(font)
-        return fonts or pg.font.get_fonts(), path
+            fonts = [font for font in os.listdir(path) if font.endswith(".ttf")]
+        else:
+            fonts = pg.font.get_fonts()
+        return fonts, path
 
     def render_fonts(self, text="A display of font &N"):
         """

setup.py

@@ -126,7 +126,7 @@ def spawn(self, cmd, **kwargs):
     distutils.ccompiler.CCompiler.spawn = spawn
 
 # A (bit hacky) fix for https://github.com/pygame/pygame/issues/2613
-# This is due to the fact that distutils uses command line args to 
+# This is due to the fact that distutils uses command line args to
 # export PyInit_* functions on windows, but those functions are already exported
 # and that is why compiler gives warnings
 from distutils.command.build_ext import build_ext
@@ -311,7 +311,7 @@ def consume_arg(name):
     for i, kwargs in enumerate(queue):
         kwargs['progress'] = f'[{i + 1}/{count}] '
         cythonize_one(**kwargs)
-    
+
     if cython_only:
         sys.exit(0)
 
@@ -467,7 +467,7 @@ def run_install_headers(self):
 
     if "freetype" in e.name and sys.platform not in ("darwin", "win32"):
         # TODO: fix freetype issues here
-        if sysconfig.get_config_var("MAINCC") != "clang":        
+        if sysconfig.get_config_var("MAINCC") != "clang":
             e.extra_compile_args.append("-Wno-error=unused-but-set-variable")
 
     if "mask" in e.name and IS_MSC:

src_py/cursors.py

@@ -828,17 +828,10 @@ def bitswap(num):
         if line.startswith(possible_starts):
             break
     data = " ".join(curs[i + 1 :]).replace("};", "").replace(",", " ")
-    cursdata = []
-    for x in data.split():
-        cursdata.append(bitswap(int(x, 16)))
-    cursdata = tuple(cursdata)
+    cursdata = tuple(bitswap(int(x, 16)) for x in data.split())
     for i, line in enumerate(mask):
         if line.startswith(possible_starts):
             break
     data = " ".join(mask[i + 1 :]).replace("};", "").replace(",", " ")
-    maskdata = []
-    for x in data.split():
-        maskdata.append(bitswap(int(x, 16)))
-
-    maskdata = tuple(maskdata)
+    maskdata = tuple(bitswap(int(x, 16)) for x in data.split())
     return info[:2], info[2:], cursdata, maskdata

src_py/surfarray.py

@@ -56,10 +56,11 @@
 
 
 # float96 not available on all numpy versions.
-numpy_floats = []
-for type_name in "float32 float64 float96".split():
-    if hasattr(numpy, type_name):
-        numpy_floats.append(getattr(numpy, type_name))
+numpy_floats = [
+    getattr(numpy, type_name)
+    for type_name in "float32 float64 float96".split()
+    if hasattr(numpy, type_name)
+]
 # Added below due to deprecation of numpy.float. See issue #2814
 numpy_floats.append(float)
 

src_py/sysfont.py

@@ -163,9 +163,7 @@ def _font_finder_darwin():
 
     strange_root = "/System/Library/Assets/com_apple_MobileAsset_Font3"
     if exists(strange_root):
-        strange_locations = os.listdir(strange_root)
-        for loc in strange_locations:
-            locations.append(f"{strange_root}/{loc}/AssetData")
+        locations += [f"{strange_root}/{loc}" for loc in os.listdir(strange_root)]
 
     fonts = {}
 
@@ -240,7 +238,7 @@ def initsysfonts_unix(path="fc-list"):
         for entry in proc.stdout.decode("ascii", "ignore").splitlines():
             try:
                 _parse_font_entry_unix(entry, fonts)
-            except ValueError:
+            except ValueError:  # noqa: PERF203
                 # try the next one.
                 pass
 

src_py/threads/__init__.py

@@ -267,5 +267,5 @@ def tmap(f, seq_args, num_workers=20, worker_queue=None, wait=True, stop_on_erro
             if error_ones:
                 raise error_ones[0].exception
 
-        return map(lambda x: x.result, results)
+        return (x.result for x in results)
     return [wq, results]

test/draw_test.py

@@ -1446,7 +1446,7 @@ def test_line__invalid_start_pos_formats(self):
             (2, 1, 0),  # Too many coords.
             (2, "1"),  # Wrong type.
             {2, 1},  # Wrong type.
-            dict(((2, 1),)),
+            {2: 1},
         )  # Wrong type.
 
         for start_pos in start_pos_fmts:
@@ -1470,7 +1470,7 @@ def test_line__invalid_end_pos_formats(self):
             (2, 1, 0),  # Too many coords.
             (2, "1"),  # Wrong type.
             {2, 1},  # Wrong type.
-            dict(((2, 1),)),
+            {2: 1},
         )  # Wrong type.
 
         for end_pos in end_pos_fmts:
@@ -2122,9 +2122,9 @@ def test_lines__invalid_points_formats(self):
             ((1, 1), (2, 2, 2)),  # Too many coords.
             ((1, 1), (2, "2")),  # Wrong type.
             ((1, 1), {2, 3}),  # Wrong type.
-            ((1, 1), dict(((2, 2), (3, 3)))),  # Wrong type.
+            ((1, 1), {2: 2, 3: 3}),  # Wrong type.
             {(1, 1), (1, 2)},  # Wrong type.
-            dict(((1, 1), (4, 4))),
+            {1: 1, 4: 4},
         )  # Wrong type.
 
         for points in points_fmts:
@@ -2715,7 +2715,7 @@ def test_aaline__invalid_start_pos_formats(self):
             (2, 1, 0),  # Too many coords.
             (2, "1"),  # Wrong type.
             {2, 1},  # Wrong type.
-            dict(((2, 1),)),
+            {2: 1},
         )  # Wrong type.
 
         for start_pos in start_pos_fmts:
@@ -2738,7 +2738,7 @@ def test_aaline__invalid_end_pos_formats(self):
             (2, 1, 0),  # Too many coords.
             (2, "1"),  # Wrong type.
             {2, 1},  # Wrong type.
-            dict(((2, 1),)),
+            {2: 1},
         )  # Wrong type.
 
         for end_pos in end_pos_fmts:
@@ -3441,9 +3441,9 @@ def test_aalines__invalid_points_formats(self):
             ((1, 1), (2, 2, 2)),  # Too many coords.
             ((1, 1), (2, "2")),  # Wrong type.
             ((1, 1), {2, 3}),  # Wrong type.
-            ((1, 1), dict(((2, 2), (3, 3)))),  # Wrong type.
+            ((1, 1), {2: 2, 3: 3}),  # Wrong type.
             {(1, 1), (1, 2)},  # Wrong type.
-            dict(((1, 1), (4, 4))),
+            {1: 1, 4: 4},
         )  # Wrong type.
 
         for points in points_fmts:
@@ -3952,9 +3952,9 @@ def test_polygon__invalid_points_formats(self):
             ((1, 1), (2, 1), (2, 2, 2)),  # Too many coords.
             ((1, 1), (2, 1), (2, "2")),  # Wrong type.
             ((1, 1), (2, 1), {2, 3}),  # Wrong type.
-            ((1, 1), (2, 1), dict(((2, 2), (3, 3)))),  # Wrong type.
+            ((1, 1), (2, 1), {2: 2, 3: 3}),  # Wrong type.
             {(1, 1), (2, 1), (2, 2), (1, 2)},  # Wrong type.
-            dict(((1, 1), (2, 2), (3, 3), (4, 4))),
+            {1: 1, 2: 2, 3: 3, 4: 4},
         )  # Wrong type.
 
         for points in points_fmts:
@@ -3973,7 +3973,7 @@ def test_polygon__invalid_points_values(self):
         }
 
         points_fmts = (
-            tuple(),  # Too few points.
+            (),  # Too few points.
             ((1, 1),),  # Too few points.
             ((1, 1), (2, 1)),
         )  # Too few points.

test/event_test.py

@@ -31,9 +31,9 @@
     {
         pygame.KEYDOWN: {"key": pygame.K_SPACE},
         pygame.KEYUP: {"key": pygame.K_SPACE},
-        pygame.MOUSEMOTION: dict(),
-        pygame.MOUSEBUTTONDOWN: dict(button=1),
-        pygame.MOUSEBUTTONUP: dict(button=1),
+        pygame.MOUSEMOTION: {},
+        pygame.MOUSEBUTTONDOWN: {"button": 1},
+        pygame.MOUSEBUTTONUP: {"button": 1},
     }
 )
 

test/mouse_test.py

@@ -134,7 +134,7 @@ def test_set_system_cursor(self):
             # Making sure the warnings are working properly
             self.assertEqual(len(w), 6)
             self.assertTrue(
-                all([issubclass(warn.category, DeprecationWarning) for warn in w])
+                all(issubclass(warn.category, DeprecationWarning) for warn in w)
             )
 
     @unittest.skipIf(

test/test_utils/png.py

@@ -746,15 +746,15 @@ def extend(sl):
                 a.extend([0] * int(extra))
                 # Pack into bytes
                 l = group(a, spb)
-                l = map(lambda e: reduce(lambda x, y: (x << self.bitdepth) + y, e), l)
+                l = (reduce(lambda x, y: (x << self.bitdepth) + y, e) for e in l)
                 data.extend(l)
 
         if self.rescale:
             oldextend = extend
             factor = float(2 ** self.rescale[1] - 1) / float(2 ** self.rescale[0] - 1)
 
             def extend(sl):
-                oldextend(map(lambda x: int(round(factor * x)), sl))
+                oldextend((int(round(factor * x)) for x in sl))
 
         # Build the first row, testing mostly to see if we need to
         # changed the extend function to cope with NumPy integer types
@@ -1642,7 +1642,7 @@ def asvalues(raw):
             mask = 2**self.bitdepth - 1
             shifts = map(self.bitdepth.__mul__, reversed(range(spb)))
             for o in raw:
-                out.extend(map(lambda i: mask & (o >> i), shifts))
+                out.extend((mask & (o >> i) for i in shifts))
             return out[:width]
 
         return map(asvalues, rows)
@@ -1941,7 +1941,7 @@ def iterdecomp(idat):
             )
         else:
             pixels = self.iterboxed(self.iterstraight(raw))
-        meta = dict()
+        meta = {}
         for attr in "greyscale alpha planes bitdepth interlace".split():
             meta[attr] = getattr(self, attr)
         meta["size"] = (self.width, self.height)
@@ -2128,7 +2128,7 @@ def _as_rescale(self, get, targetbitdepth):
 
         def iterscale():
             for row in pixels:
-                yield map(lambda x: int(round(x * factor)), row)
+                yield (int(round(x * factor)) for x in row)
 
         return width, height, iterscale(), meta
 
@@ -2426,7 +2426,7 @@ def testPtrns(self):
         d = d + (255,)
         e = e + (255,)
         boxed = [(e, d, c), (d, c, a), (c, a, b)]
-        flat = map(lambda row: itertools.chain(*row), boxed)
+        flat = (itertools.chain(*row) for row in boxed)
         self.assertEqual(map(list, pixels), map(list, flat))
 
     def testRGBtoRGBA(self):
@@ -2744,8 +2744,8 @@ def testfromarrayIter(self):
         import itertools
 
         i = itertools.islice(itertools.count(10), 20)
-        i = map(lambda x: [x, x, x], i)
-        img = from_array(i, "RGB;5", dict(height=20))
+        i = ([x, x, x] for x in i)
+        img = from_array(i, "RGB;5", {"height": 20})
         f = open("testiter.png", "wb")
         img.save(f)
         f.close()
@@ -3606,7 +3606,7 @@ def read_pam_header(infile):
     """
 
     # Unlike PBM, PGM, and PPM, we can read the header a line at a time.
-    header = dict()
+    header = {}
     while True:
         l = infile.readline().strip()
         if l == strtobytes("ENDHDR"):
@@ -3960,7 +3960,7 @@ def _main(argv):
         # care about TUPLTYPE.
         greyscale = depth <= 2
         pamalpha = depth in (2, 4)
-        supported = map(lambda x: 2**x - 1, range(1, 17))
+        supported = (2**x - 1 for x in range(1, 17))
         try:
             mi = supported.index(maxval)
         except ValueError: