Merge pull request #2762 from Starbuck5/remove-pygame-threads

Remove pygame.threads

Author: Starbuck5

buildconfig/stubs/gen_stubs.py

@@ -35,7 +35,6 @@
     "surfarray",
     "transform",
     "scrap",
-    "threads",
     "version",
     "base",
     "bufferproxy",

buildconfig/stubs/pygame/__init__.pyi

@@ -22,7 +22,6 @@ from pygame import (
     surfarray as surfarray,
     transform as transform,
     scrap as scrap,
-    threads as threads,
     version as version,
     base as base,
     bufferproxy as bufferproxy,

setup.py

@@ -947,7 +947,6 @@ def run(self):
 PACKAGEDATA = {
     "cmdclass": cmdclass,
     "packages": ['pygame',
-                 'pygame.threads',
                  'pygame._sdl2',
                  'pygame.tests',
                  'pygame.tests.test_utils',
@@ -956,7 +955,6 @@ def run(self):
                  'pygame.__pyinstaller'],
     "package_dir": {'pygame': 'src_py',
                     'pygame._sdl2': 'src_py/_sdl2',
-                    'pygame.threads': 'src_py/threads',
                     'pygame.tests': 'test',
                     'pygame.docs': 'docs',
                     'pygame.examples': 'examples',
@@ -977,11 +975,9 @@ def run(self):
     PACKAGEDATA = {
         "cmdclass": cmdclass,
         "packages": ['pygame',
-                     'pygame.threads',
                      'pygame._sdl2'],
         "package_dir": {'pygame': 'src_py',
-                        'pygame._sdl2': 'src_py/_sdl2',
-                        'pygame.threads': 'src_py/threads'},
+                        'pygame._sdl2': 'src_py/_sdl2'},
         "ext_modules": extensions,
         "zip_safe": False,
         "data_files": data_files

src_py/__init__.py

@@ -197,10 +197,6 @@ def Cursor(*args):  # pylint: disable=unused-argument
 except (ImportError, OSError):
     sprite = MissingModule("sprite", urgent=1)
 
-try:
-    import pygame.threads
-except (ImportError, OSError):
-    threads = MissingModule("threads", urgent=1)
 
 try:
     import pygame.pixelcopy

src_py/threads/__init__.py

@@ -6,6 +6,7 @@
 import unittest
 import glob
 import pathlib
+from concurrent.futures import ThreadPoolExecutor
 
 from pygame.tests.test_utils import example_path, png, tostring
 import pygame, pygame.image, pygame.pkgdata
@@ -1356,12 +1357,11 @@ def test_save_extended(self):
             )
 
     def threads_load(self, images):
-        import pygame.threads
-
-        for i in range(10):
-            surfs = pygame.threads.tmap(pygame.image.load, images)
-            for s in surfs:
-                self.assertIsInstance(s, pygame.Surface)
+        for _ in range(10):
+            with ThreadPoolExecutor(max_workers=20) as executor:
+                surfs = executor.map(pygame.image.load, images)
+                for s in surfs:
+                    self.assertIsInstance(s, pygame.Surface)
 
     def test_load_png_threads(self):
         self.threads_load(glob.glob(example_path("data/*.png")))