summaryrefslogtreecommitdiff
path: root/Lib/multiprocessing/forkserver.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2013-08-28 00:53:59 +0200
committerVictor Stinner <victor.stinner@gmail.com>2013-08-28 00:53:59 +0200
commite5883d6d95989121670eca012dd5bde1721747e7 (patch)
tree0a3d97e7d4c3fd6e7381ae9357a236333315f08d /Lib/multiprocessing/forkserver.py
parent8ccecb68f7c8ca1e6e4cdde3a3a8114c737d43ae (diff)
downloadcpython-e5883d6d95989121670eca012dd5bde1721747e7.tar.gz
Issue #18571: Implementation of the PEP 446: file descriptors and file handles
are now created non-inheritable; add functions os.get/set_inheritable(), os.get/set_handle_inheritable() and socket.socket.get/set_inheritable().
Diffstat (limited to 'Lib/multiprocessing/forkserver.py')
-rw-r--r--Lib/multiprocessing/forkserver.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/multiprocessing/forkserver.py b/Lib/multiprocessing/forkserver.py
index 208bd4e31d..11df38285c 100644
--- a/Lib/multiprocessing/forkserver.py
+++ b/Lib/multiprocessing/forkserver.py
@@ -60,8 +60,8 @@ def connect_to_new_process(fds):
raise ValueError('too many fds')
with socket.socket(socket.AF_UNIX) as client:
client.connect(_forkserver_address)
- parent_r, child_w = util.pipe()
- child_r, parent_w = util.pipe()
+ parent_r, child_w = os.pipe()
+ child_r, parent_w = os.pipe()
allfds = [child_r, child_w, _forkserver_alive_fd,
semaphore_tracker._semaphore_tracker_fd]
allfds += fds