From: Richard Oudkerk <shibturn@gmail.com>
Date: Tue, 2 Jul 2013 12:31:43 +0000 (+0100)
Subject: Issue #17261: Ensure multiprocessing's proxies use proper address.
X-Git-Tag: v2.7.6rc1~313
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e462fefd60d3389c6f3d6aaffd2fe066565f596;p=thirdparty%2FPython%2Fcpython.git

Issue #17261: Ensure multiprocessing's proxies use proper address.
---

diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index ffe5812b89db..08d35d868285 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -763,6 +763,7 @@ class BaseProxy(object):
         elif kind == '#PROXY':
             exposed, token = result
             proxytype = self._manager._registry[token.typeid][-1]
+            token.address = self._token.address
             proxy = proxytype(
                 token, self._serializer, manager=self._manager,
                 authkey=self._authkey, exposed=exposed
diff --git a/Misc/NEWS b/Misc/NEWS
index 5c9e36777538..405bf5c493e7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #17261: Ensure multiprocessing's proxies use proper address.
+
 - Issue #17097: Make multiprocessing ignore EINTR.
 
 - Issue #18155: The csv module now correctly handles csv files that use