]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-107963: Fix set_forkserver_preload to check the type of given list (GH...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 15 Aug 2023 14:56:53 +0000 (07:56 -0700)
committerGitHub <noreply@github.com>
Tue, 15 Aug 2023 14:56:53 +0000 (16:56 +0200)
gh-107963: Fix set_forkserver_preload to check the type of given list (GH-107965)
(cherry picked from commit 6515ec3d3d5acd3d0b99c88794bdec09f0831e5b)

gh-107963: Fix set_forkserver_preload to check the type of given list

Co-authored-by: Dong-hee Na <donghee.na@python.org>
Lib/multiprocessing/forkserver.py
Lib/test/_test_multiprocessing.py
Misc/NEWS.d/next/Library/2023-08-15-18-20-00.gh-issue-107963.20g5BG.rst [new file with mode: 0644]

index 22a911a7a29cdc0219cb46da48fa7e2081abcc83..4642707dae2f4e252554a2f71575289e9064b499 100644 (file)
@@ -61,7 +61,7 @@ class ForkServer(object):
 
     def set_forkserver_preload(self, modules_names):
         '''Set list of module names to try to load in forkserver process.'''
-        if not all(type(mod) is str for mod in self._preload_modules):
+        if not all(type(mod) is str for mod in modules_names):
             raise TypeError('module_names must be a list of strings')
         self._preload_modules = modules_names
 
index c13b049645ac90ac266f386515ed030030e77e17..4afbe172a1eefab516e2a255d3c3b7fea5fd1b7a 100644 (file)
@@ -5331,6 +5331,14 @@ class TestStartMethod(unittest.TestCase):
             self.assertRaises(ValueError, ctx.set_start_method, None)
             self.check_context(ctx)
 
+    def test_context_check_module_types(self):
+        try:
+            ctx = multiprocessing.get_context('forkserver')
+        except ValueError:
+            raise unittest.SkipTest('forkserver should be available')
+        with self.assertRaisesRegex(TypeError, 'module_names must be a list of strings'):
+            ctx.set_forkserver_preload([1, 2, 3])
+
     def test_set_get(self):
         multiprocessing.set_forkserver_preload(PRELOAD)
         count = 0
diff --git a/Misc/NEWS.d/next/Library/2023-08-15-18-20-00.gh-issue-107963.20g5BG.rst b/Misc/NEWS.d/next/Library/2023-08-15-18-20-00.gh-issue-107963.20g5BG.rst
new file mode 100644 (file)
index 0000000..3a73b2d
--- /dev/null
@@ -0,0 +1,2 @@
+Fix :func:`multiprocessing.set_forkserver_preload` to check the given list
+of modules names. Patch by Dong-hee Na.