Merge 3.2

This commit is contained in:
Richard Oudkerk 2012-08-14 12:51:14 +01:00
commit 3165a75e45
4 changed files with 40 additions and 2 deletions

View file

@ -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.