mirror of
https://github.com/python/cpython.git
synced 2025-12-31 04:23:37 +00:00
[3.14] gh-138813: Fix mutable default kwargs={} in multiprocessing BaseProcess and DummyProcess to use None (GH-138814) (#139084)
gh-138813: Fix mutable default kwargs={} in multiprocessing BaseProcess and DummyProcess to use None (GH-138814)
* gh-138813: Default `BaseProcess` `kwargs` to `None` (GH-138814)
Set `BaseProcess.__init__(..., kwargs=None)` and initialize `kwargs` with
`dict(kwargs) if kwargs else {}`. This avoids a shared mutable default and
matches threading.Thread behavior.
* DummyProcess kwargs=None (which threading.Thread accepts properly)
(cherry picked from commit 5a15e73789)
Co-authored-by: Denis Sergeev <newjimbatler00@gmail.com>
Co-authored-by: Gregory P. Smith <greg@krypto.org>
Co-authored-by: Petr Viktorin <encukou@gmail.com>
Co-authored-by: Gregory P. Smith <68491+gpshead@users.noreply.github.com>
This commit is contained in:
parent
64f0e2d6fa
commit
6b26e62f37
4 changed files with 21 additions and 3 deletions
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
class DummyProcess(threading.Thread):
|
||||
|
||||
def __init__(self, group=None, target=None, name=None, args=(), kwargs={}):
|
||||
def __init__(self, group=None, target=None, name=None, args=(), kwargs=None):
|
||||
threading.Thread.__init__(self, group, target, name, args, kwargs)
|
||||
self._pid = None
|
||||
self._children = weakref.WeakKeyDictionary()
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ class BaseProcess(object):
|
|||
def _Popen(self):
|
||||
raise NotImplementedError
|
||||
|
||||
def __init__(self, group=None, target=None, name=None, args=(), kwargs={},
|
||||
def __init__(self, group=None, target=None, name=None, args=(), kwargs=None,
|
||||
*, daemon=None):
|
||||
assert group is None, 'group argument must be None for now'
|
||||
count = next(_process_counter)
|
||||
|
|
@ -89,7 +89,7 @@ def __init__(self, group=None, target=None, name=None, args=(), kwargs={},
|
|||
self._closed = False
|
||||
self._target = target
|
||||
self._args = tuple(args)
|
||||
self._kwargs = dict(kwargs)
|
||||
self._kwargs = dict(kwargs) if kwargs else {}
|
||||
self._name = name or type(self).__name__ + '-' + \
|
||||
':'.join(str(i) for i in self._identity)
|
||||
if daemon is not None:
|
||||
|
|
|
|||
|
|
@ -5173,6 +5173,23 @@ def test_invalid_handles(self):
|
|||
multiprocessing.connection.Connection, -1)
|
||||
|
||||
|
||||
#
|
||||
# Regression tests for BaseProcess kwargs handling
|
||||
#
|
||||
|
||||
class TestBaseProcessKwargs(unittest.TestCase):
|
||||
def test_default_kwargs_not_shared_between_instances(self):
|
||||
# Creating multiple Process instances without passing kwargs
|
||||
# must create independent empty dicts (no shared state).
|
||||
p1 = multiprocessing.Process(target=lambda: None)
|
||||
p2 = multiprocessing.Process(target=lambda: None)
|
||||
self.assertIsInstance(p1._kwargs, dict)
|
||||
self.assertIsInstance(p2._kwargs, dict)
|
||||
self.assertIsNot(p1._kwargs, p2._kwargs)
|
||||
# Mutating one should not affect the other
|
||||
p1._kwargs['x'] = 1
|
||||
self.assertNotIn('x', p2._kwargs)
|
||||
|
||||
|
||||
@hashlib_helper.requires_hashdigest('sha256')
|
||||
class OtherTest(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
:class:`!multiprocessing.BaseProcess` defaults ``kwargs`` to ``None`` instead of a shared dictionary.
|
||||
Loading…
Add table
Add a link
Reference in a new issue