From 9268fb537ba19b2629c1282ea822ccf5b989d266 Mon Sep 17 00:00:00 2001
From: finefoot <33361833+finefoot@users.noreply.github.com>
Date: Tue, 24 Sep 2019 02:42:24 +0200
Subject: [PATCH 1/3] Add test for nested queues

---
 Lib/test/_test_multiprocessing.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index c717d0aad2874b..3f734dea9f4e96 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -2257,6 +2257,16 @@ def test_dict_proxy_nested(self):
         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'

From 3f6cd1549500b761a657d0f49e1551b6a9b5437d Mon Sep 17 00:00:00 2001
From: finefoot <33361833+finefoot@users.noreply.github.com>
Date: Wed, 25 Sep 2019 20:14:16 +0200
Subject: [PATCH 2/3] Create 2019-09-25-18-10-10.bpo-30256.A5i76Q.rst

---
 Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Tests/2019-09-25-18-10-10.bpo-30256.A5i76Q.rst

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 00000000000000..4a7cfd52fcea22
--- /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``

From 2cc589434d505d08978d2499f15683acfccc1405 Mon Sep 17 00:00:00 2001
From: Jordan Speicher <jordan@jspeicher.com>
Date: Tue, 12 Dec 2017 12:03:34 -0600
Subject: [PATCH 3/3] bpo-30256: pass all BaseProxy arguments through AutoProxy

---
 Lib/multiprocessing/managers.py                               | 4 ++--
 .../next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2019-09-25-13-54-41.bpo-30256.wBkzox.rst

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index 75b5150f821b1c..60ebd3314c07e1 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -958,7 +958,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`
     '''
@@ -978,7 +978,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/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 00000000000000..4490803f32642e
--- /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