diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2012-08-14 11:51:14 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2012-08-14 11:51:14 (GMT) |
| commit | 3165a75e45817e858b77ce307cebb93657249dc2 (patch) | |
| tree | 7511830c6138de57f2f45ac10ea2a3ba9293e052 /Lib/multiprocessing | |
| parent | e471772fff6cde0f0f30aab62bb4c4d57271bbcf (diff) | |
| parent | e88a2445bc31dce0caa0be9b543689a953c1f920 (diff) | |
| download | cpython-3165a75e45817e858b77ce307cebb93657249dc2.zip cpython-3165a75e45817e858b77ce307cebb93657249dc2.tar.gz cpython-3165a75e45817e858b77ce307cebb93657249dc2.tar.bz2 | |
Merge 3.2
Diffstat (limited to 'Lib/multiprocessing')
| -rw-r--r-- | Lib/multiprocessing/forking.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py index 3beb816..af6580d 100644 --- a/Lib/multiprocessing/forking.py +++ b/Lib/multiprocessing/forking.py @@ -305,7 +305,7 @@ else: ''' Returns prefix of command line used for spawning a child process ''' - if process.current_process()._identity==() and is_forking(sys.argv): + if getattr(process.current_process(), '_inheriting', False): raise RuntimeError(''' Attempt to start a new process before the current process has finished its bootstrapping phase. |