##// END OF EJS Templates
Fixing unticketed bug in ipcluster.py....
Brian Granger -
Show More
@@ -1,4 +1,4 b''
1 #!/usr/bin/env python
1 #!/usr/bin/env python
2 # encoding: utf-8
2 # encoding: utf-8
3
3
4 """Start an IPython cluster = (controller + engines)."""
4 """Start an IPython cluster = (controller + engines)."""
@@ -184,8 +184,10 b' class ControllerLauncher(ProcessLauncher):'
184 from IPython.kernel.scripts import ipcontroller
184 from IPython.kernel.scripts import ipcontroller
185 script_location = ipcontroller.__file__.replace('.pyc', '.py')
185 script_location = ipcontroller.__file__.replace('.pyc', '.py')
186 # The -u option here turns on unbuffered output, which is required
186 # The -u option here turns on unbuffered output, which is required
187 # on Win32 to prevent wierd conflict and problems with Twisted
187 # on Win32 to prevent wierd conflict and problems with Twisted.
188 args = [find_exe('python'), '-u', script_location]
188 # Also, use sys.executable to make sure we are picking up the
189 # right python exe.
190 args = [sys.executable, '-u', script_location]
189 else:
191 else:
190 args = ['ipcontroller']
192 args = ['ipcontroller']
191 self.extra_args = extra_args
193 self.extra_args = extra_args
@@ -204,8 +206,10 b' class EngineLauncher(ProcessLauncher):'
204 from IPython.kernel.scripts import ipengine
206 from IPython.kernel.scripts import ipengine
205 script_location = ipengine.__file__.replace('.pyc', '.py')
207 script_location = ipengine.__file__.replace('.pyc', '.py')
206 # The -u option here turns on unbuffered output, which is required
208 # The -u option here turns on unbuffered output, which is required
207 # on Win32 to prevent wierd conflict and problems with Twisted
209 # on Win32 to prevent wierd conflict and problems with Twisted.
208 args = [find_exe('python'), '-u', script_location]
210 # Also, use sys.executable to make sure we are picking up the
211 # right python exe.
212 args = [sys.executable, '-u', script_location]
209 else:
213 else:
210 args = ['ipengine']
214 args = ['ipengine']
211 self.extra_args = extra_args
215 self.extra_args = extra_args
General Comments 0
You need to be logged in to leave comments. Login now