diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-07-02 04:35:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-02 04:35:31 (GMT) |
| commit | 8aa45de6c6d84397b772bad7e032744010bbd456 (patch) | |
| tree | 14169ac2bae1fcfc7b9feb7780c9928f665f89ad | |
| parent | 67e394562d67cbcd0ac8114e5439494e7645b8f5 (diff) | |
| download | cpython-8aa45de6c6d84397b772bad7e032744010bbd456.zip cpython-8aa45de6c6d84397b772bad7e032744010bbd456.tar.gz cpython-8aa45de6c6d84397b772bad7e032744010bbd456.tar.bz2 | |
bpo-30256: Add manager_owned keyword arg to AutoProxy (GH-16341) (GH-26989)
Co-authored-by: Jordan Speicher <jordan@jspeicher.com>
(cherry picked from commit 85b920498b42c69185540ecc2f5c4907fd38d877)
Co-authored-by: finefoot <33361833+finefoot@users.noreply.github.com>
| -rw-r--r-- | Lib/multiprocessing/managers.py | 4 | ||||
| -rw-r--r-- | Lib/test/_test_multiprocessing.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst | 1 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py index 0eb16c6..f8d3cef 100644 --- a/Lib/multiprocessing/managers.py +++ b/Lib/multiprocessing/managers.py @@ -959,7 +959,7 @@ def MakeProxyType(name, exposed, _cache={}): def AutoProxy(token, serializer, manager=None, authkey=None, - exposed=None, incref=True): + exposed=None, incref=True, manager_owned=False): ''' Return an auto-proxy for `token` ''' @@ -979,7 +979,7 @@ def AutoProxy(token, serializer, manager=None, authkey=None, ProxyType = MakeProxyType('AutoProxy[%s]' % token.typeid, exposed) proxy = ProxyType(token, serializer, manager=manager, authkey=authkey, - incref=incref) + incref=incref, manager_owned=manager_owned) proxy._isauto = True return proxy diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index e47905c..ebd44f9 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -2282,6 +2282,16 @@ class _TestContainers(BaseTestCase): self.assertIsInstance(outer[0], list) # Not a ListProxy self.assertEqual(outer[-1][-1]['feed'], 3) + def test_nested_queue(self): + a = self.list() # Test queue inside list + a.append(self.Queue()) + a[0].put(123) + self.assertEqual(a[0].get(), 123) + b = self.dict() # Test queue inside dict + b[0] = self.Queue() + b[0].put(456) + self.assertEqual(b[0].get(), 456) + def test_namespace(self): n = self.Namespace() n.name = 'Bob' diff --git a/Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst b/Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst new file mode 100644 index 0000000..4490803 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst @@ -0,0 +1 @@ +Pass multiprocessing BaseProxy argument `manager_owned` through AutoProxy diff --git a/Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst b/Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst new file mode 100644 index 0000000..4a7cfd5 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst @@ -0,0 +1,2 @@ +Add test for nested queues when using ``multiprocessing`` shared objects +``AutoProxy[Queue]`` inside ``ListProxy`` and ``DictProxy`` |