##// END OF EJS Templates
Pass host environment on to kernel...
Rob Young -
Show More
@@ -207,7 +207,7 b' def launch_kernel(cmd, stdin=None, stdout=None, stderr=None,'
207 if independent:
207 if independent:
208 proc = Popen(cmd,
208 proc = Popen(cmd,
209 creationflags=512, # CREATE_NEW_PROCESS_GROUP
209 creationflags=512, # CREATE_NEW_PROCESS_GROUP
210 stdin=_stdin, stdout=_stdout, stderr=_stderr)
210 stdin=_stdin, stdout=_stdout, stderr=_stderr, env=os.environ)
211 else:
211 else:
212 if ipython_kernel:
212 if ipython_kernel:
213 try:
213 try:
@@ -224,7 +224,7 b' def launch_kernel(cmd, stdin=None, stdout=None, stderr=None,'
224
224
225
225
226 proc = Popen(cmd,
226 proc = Popen(cmd,
227 stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd)
227 stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd, env=os.environ)
228
228
229 # Attach the interrupt event to the Popen objet so it can be used later.
229 # Attach the interrupt event to the Popen objet so it can be used later.
230 proc.win32_interrupt_event = interrupt_event
230 proc.win32_interrupt_event = interrupt_event
@@ -232,12 +232,12 b' def launch_kernel(cmd, stdin=None, stdout=None, stderr=None,'
232 else:
232 else:
233 if independent:
233 if independent:
234 proc = Popen(cmd, preexec_fn=lambda: os.setsid(),
234 proc = Popen(cmd, preexec_fn=lambda: os.setsid(),
235 stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd)
235 stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd, env=os.environ)
236 else:
236 else:
237 if ipython_kernel:
237 if ipython_kernel:
238 cmd += ['--parent=1']
238 cmd += ['--parent=1']
239 proc = Popen(cmd,
239 proc = Popen(cmd,
240 stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd)
240 stdin=_stdin, stdout=_stdout, stderr=_stderr, cwd=cwd, env=os.environ)
241
241
242 # Clean up pipes created to work around Popen bug.
242 # Clean up pipes created to work around Popen bug.
243 if redirect_in:
243 if redirect_in:
@@ -255,4 +255,4 b' __all__ = ['
255 'swallow_argv',
255 'swallow_argv',
256 'make_ipkernel_cmd',
256 'make_ipkernel_cmd',
257 'launch_kernel',
257 'launch_kernel',
258 ] No newline at end of file
258 ]
General Comments 0
You need to be logged in to leave comments. Login now