Replace np.alltrue with np.all for np v2 support

damusss · Jun 17, 2024 · 875ed65 · 875ed65
1 parent e14abb1
commit 875ed65
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/test/pixelcopy_test.py b/test/pixelcopy_test.py
@@ -534,7 +534,7 @@ def test_surface_to_array_3d(self):
 
     def test_map_array(self):
         try:
-            from numpy import array, zeros, uint8, int32, alltrue
+            from numpy import array, zeros, uint8, int32, all as np_all
         except ImportError:
             return
 
@@ -545,15 +545,15 @@ def test_map_array(self):
         target = zeros((5, 7), int32)
         map_array(target, color, surf)
 
-        self.assertTrue(alltrue(target == surf.map_rgb(color)))
+        self.assertTrue(np_all(target == surf.map_rgb(color)))
 
         # array column stripes
         stripe = array([[2, 5, 7], [11, 19, 23], [37, 53, 101]], uint8)
         target = zeros((4, stripe.shape[0]), int32)
         map_array(target, stripe, surf)
         target_stripe = array([surf.map_rgb(c) for c in stripe], int32)
 
-        self.assertTrue(alltrue(target == target_stripe))
+        self.assertTrue(np_all(target == target_stripe))
 
         # array row stripes
         stripe = array(
@@ -563,7 +563,7 @@ def test_map_array(self):
         map_array(target, stripe, surf)
         target_stripe = array([[surf.map_rgb(c)] for c in stripe[:, 0]], int32)
 
-        self.assertTrue(alltrue(target == target_stripe))
+        self.assertTrue(np_all(target == target_stripe))
 
         # mismatched shape
         w = 4

diff --git a/test/sndarray_test.py b/test/sndarray_test.py
@@ -1,6 +1,6 @@
 import unittest
 
-from numpy import int8, int16, uint8, uint16, float32, array, alltrue
+from numpy import int8, int16, uint8, uint16, float32, array, all as np_all
 
 import pygame
 import pygame.sndarray
@@ -28,7 +28,7 @@ def check_array(size, channels, test_data):
                     arr = pygame.sndarray.array(snd)
                     self._assert_compatible(arr, size)
                     self.assertTrue(
-                        alltrue(arr == srcarr),
+                        np_all(arr == srcarr),
                         "size: %i\n%s\n%s" % (size, arr, test_data),
                     )
             finally:
@@ -71,7 +71,7 @@ def check_sound(size, channels, test_data):
                     snd = pygame.sndarray.make_sound(srcarr)
                     arr = pygame.sndarray.samples(snd)
                     self.assertTrue(
-                        alltrue(arr == srcarr),
+                        np_all(arr == srcarr),
                         "size: %i\n%s\n%s" % (size, arr, test_data),
                     )
             finally:
@@ -110,7 +110,7 @@ def check_sample(size, channels, test_data):
                     samples[...] = test_data
                     arr = pygame.sndarray.array(snd)
                     self.assertTrue(
-                        alltrue(samples == arr),
+                        np_all(samples == arr),
                         "size: %i\n%s\n%s" % (size, arr, test_data),
                     )
             finally:

diff --git a/test/surfarray_test.py b/test/surfarray_test.py
@@ -9,7 +9,7 @@
     zeros,
     float32,
     float64,
-    alltrue,
+    all as np_all,
     rint,
     arange,
 )
@@ -235,15 +235,15 @@ def test_array_alpha(self):
                         ),
                     )
             else:
-                self.assertTrue(alltrue(arr == 255))
+                self.assertTrue(np_all(arr == 255))
 
         # No per-pixel alpha when blanket alpha is None.
         for surf in targets:
             blanket_alpha = surf.get_alpha()
             surf.set_alpha(None)
             arr = pygame.surfarray.array_alpha(surf)
             self.assertTrue(
-                alltrue(arr == 255),
+                np_all(arr == 255),
                 "All alpha values should be 255 when"
                 " surf.set_alpha(None) has been set."
                 " bitsize: %i, flags: %i" % (surf.get_bitsize(), surf.get_flags()),
@@ -257,12 +257,12 @@ def test_array_alpha(self):
             arr = pygame.surfarray.array_alpha(surf)
             if surf.get_masks()[3]:
                 self.assertFalse(
-                    alltrue(arr == 255),
+                    np_all(arr == 255),
                     "bitsize: %i, flags: %i" % (surf.get_bitsize(), surf.get_flags()),
                 )
             else:
                 self.assertTrue(
-                    alltrue(arr == 255),
+                    np_all(arr == 255),
                     "bitsize: %i, flags: %i" % (surf.get_bitsize(), surf.get_flags()),
                 )
             surf.set_alpha(blanket_alpha)
@@ -290,7 +290,7 @@ def test_array_colorkey(self):
                 p = [surf.unmap_rgb(surf.map_rgb(c)) for c in p]
             surf.set_colorkey(None)
             arr = pygame.surfarray.array_colorkey(surf)
-            self.assertTrue(alltrue(arr == 255))
+            self.assertTrue(np_all(arr == 255))
 
             for i in range(1, len(palette)):
                 surf.set_colorkey(p[i])