Merge pull request #2782 from cclauss/auto-walrus

PEP572 Use Python's assignment expression

Author: oddbookworm

buildconfig/msysio.py

@@ -21,11 +21,10 @@ def print_(*args, **kwds):
 
     stream = kwds.get('file', sys.stdout)
     sep = kwds.get('sep', ' ')
-    end = kwds.get('end', '\n')
 
     if args:
         stream.write(sep.join([str(arg) for arg in args]))
-    if end:
+    if end := kwds.get('end', '\n'):
         stream.write(end)
     try:
         stream.flush()

src_py/sprite.py

@@ -410,8 +410,7 @@ def remove_internal(self, sprite):
 
         :param sprite: The sprite we are removing.
         """
-        lost_rect = self.spritedict[sprite]
-        if lost_rect:
+        if lost_rect := self.spritedict[sprite]:
             self.lostsprites.append(lost_rect)
         del self.spritedict[sprite]
 

src_py/sysfont.py

@@ -162,8 +162,7 @@ def _font_finder_darwin():
         "/System/Library/Fonts/Supplemental",
     ]
 
-    username = os.getenv("USER")
-    if username:
+    if username := os.getenv("USER"):
         locations.append(f"/Users/{username}/Library/Fonts")
 
     strange_root = "/System/Library/Assets/com_apple_MobileAsset_Font3"

test/controller_test.py

@@ -77,22 +77,19 @@ def _get_first_controller(self):
                 return controller.Controller(i)
 
     def test_construction(self):
-        c = self._get_first_controller()
-        if c:
+        if c := self._get_first_controller():
             self.assertIsInstance(c, controller.Controller)
         else:
             self.skipTest("No controller connected")
 
     def test__auto_init(self):
-        c = self._get_first_controller()
-        if c:
+        if c := self._get_first_controller():
             self.assertTrue(c.get_init())
         else:
             self.skipTest("No controller connected")
 
     def test_get_init(self):
-        c = self._get_first_controller()
-        if c:
+        if c := self._get_first_controller():
             self.assertTrue(c.get_init())
             c.quit()
             self.assertFalse(c.get_init())
@@ -111,25 +108,22 @@ def test_from_joystick(self):
         self.assertIsInstance(c, controller.Controller)
 
     def test_as_joystick(self):
-        c = self._get_first_controller()
-        if c:
+        if c := self._get_first_controller():
             joy = c.as_joystick()
             self.assertIsInstance(joy, type(pygame.joystick.Joystick(0)))
         else:
             self.skipTest("No controller connected")
 
     def test_get_mapping(self):
-        c = self._get_first_controller()
-        if c:
+        if c := self._get_first_controller():
             mapping = c.get_mapping()
             self.assertIsInstance(mapping, dict)
             self.assertIsNotNone(mapping["a"])
         else:
             self.skipTest("No controller connected")
 
     def test_set_mapping(self):
-        c = self._get_first_controller()
-        if c:
+        if c := self._get_first_controller():
             mapping = c.get_mapping()
             mapping["a"] = "b3"
             mapping["y"] = "b0"

test/mask_test.py

@@ -25,8 +25,7 @@ def random_mask(size=(100, 100)):
 
 def maskFromSurface(surface, threshold=127):
     mask = pygame.Mask(surface.get_size())
-    key = surface.get_colorkey()
-    if key:
+    if key := surface.get_colorkey():
         for y in range(surface.get_height()):
             for x in range(surface.get_width()):
                 if surface.get_at((x + 0.1, y + 0.1)) != key:

test/mixer_test.py

@@ -163,8 +163,7 @@ def test_set_soundfont(self):
         mixer.init()
 
         # test that initially, get_soundfont returns only real files
-        initial_sf = mixer.get_soundfont()
-        if initial_sf is not None:
+        if (initial_sf := mixer.get_soundfont()) is not None:
             for i in initial_sf.split(";"):
                 os.path.exists(i)
 
@@ -552,9 +551,7 @@ def test_find_channel(self):
         filename = example_path(os.path.join("data", "house_lo.wav"))
         sound = mixer.Sound(file=filename)
 
-        num_channels = mixer.get_num_channels()
-
-        if num_channels > 0:
+        if (num_channels := mixer.get_num_channels()) > 0:
             found_channel = mixer.find_channel()
             self.assertIsNotNone(found_channel)
 

test/test_utils/test_runner.py

@@ -240,8 +240,7 @@ def combine_results(all_results, t):
 
 
 def get_test_results(raw_return):
-    test_results = TEST_RESULTS_RE.search(raw_return)
-    if test_results:
+    if test_results := TEST_RESULTS_RE.search(raw_return):
         try:
             return eval(test_results.group(1))
         except: