summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing/forking.py
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-06-14 14:30:10 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-06-14 14:30:10 (GMT)
commit73d9a292aeed5aa3414c911c1f34afeea17f0dda (patch)
tree6030ad6f193aa59ce6a06006b020dbe1e85deda6 /Lib/multiprocessing/forking.py
parentbc07cb883e5c03b8c108c2c9d86bc0a158d62c27 (diff)
downloadcpython-73d9a292aeed5aa3414c911c1f34afeea17f0dda.zip
cpython-73d9a292aeed5aa3414c911c1f34afeea17f0dda.tar.gz
cpython-73d9a292aeed5aa3414c911c1f34afeea17f0dda.tar.bz2
Issue #13841: Make child processes exit using sys.exit() on Windows
Diffstat (limited to 'Lib/multiprocessing/forking.py')
-rw-r--r--Lib/multiprocessing/forking.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index 3a474cd..4baf548 100644
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -13,7 +13,7 @@ import signal
from multiprocessing import util, process
-__all__ = ['Popen', 'assert_spawning', 'exit', 'duplicate', 'close', 'ForkingPickler']
+__all__ = ['Popen', 'assert_spawning', 'duplicate', 'close', 'ForkingPickler']
#
# Check that the current thread is spawning a child process
@@ -75,7 +75,6 @@ else:
#
if sys.platform != 'win32':
- exit = os._exit
duplicate = os.dup
close = os.close
@@ -168,7 +167,6 @@ else:
WINEXE = (sys.platform == 'win32' and getattr(sys, 'frozen', False))
WINSERVICE = sys.executable.lower().endswith("pythonservice.exe")
- exit = _winapi.ExitProcess
close = _winapi.CloseHandle
#
@@ -349,7 +347,7 @@ else:
from_parent.close()
exitcode = self._bootstrap()
- exit(exitcode)
+ sys.exit(exitcode)
def get_preparation_data(name):