##// END OF EJS Templates
Fix some assumptions in kernelapp
Thomas Kluyver -
Show More
@@ -103,6 +103,7 b' class IPKernelApp(BaseIPythonApplication, InteractiveShellApp,'
103 classes = [Kernel, ZMQInteractiveShell, ProfileDir, Session]
103 classes = [Kernel, ZMQInteractiveShell, ProfileDir, Session]
104 # the kernel class, as an importstring
104 # the kernel class, as an importstring
105 kernel_class = Type('IPython.kernel.zmq.ipkernel.Kernel', config=True,
105 kernel_class = Type('IPython.kernel.zmq.ipkernel.Kernel', config=True,
106 klass='IPython.kernel.zmq.kernelbase.KernelBase',
106 help="""The Kernel subclass to be used.
107 help="""The Kernel subclass to be used.
107
108
108 This should allow easy re-use of the IPKernelApp entry point
109 This should allow easy re-use of the IPKernelApp entry point
@@ -351,8 +352,9 b' class IPKernelApp(BaseIPythonApplication, InteractiveShellApp,'
351 shell._showtraceback = _showtraceback
352 shell._showtraceback = _showtraceback
352
353
353 def init_shell(self):
354 def init_shell(self):
354 self.shell = self.kernel.shell
355 self.shell = getattr(self.kernel, 'shell', None)
355 self.shell.configurables.append(self)
356 if self.shell:
357 self.shell.configurables.append(self)
356
358
357 @catch_config_error
359 @catch_config_error
358 def initialize(self, argv=None):
360 def initialize(self, argv=None):
@@ -372,9 +374,10 b' class IPKernelApp(BaseIPythonApplication, InteractiveShellApp,'
372 # shell init steps
374 # shell init steps
373 self.init_path()
375 self.init_path()
374 self.init_shell()
376 self.init_shell()
375 self.init_gui_pylab()
377 if self.shell:
376 self.init_extensions()
378 self.init_gui_pylab()
377 self.init_code()
379 self.init_extensions()
380 self.init_code()
378 # flush stdout/stderr, so that anything written to these streams during
381 # flush stdout/stderr, so that anything written to these streams during
379 # initialization do not get associated with the first execution request
382 # initialization do not get associated with the first execution request
380 sys.stdout.flush()
383 sys.stdout.flush()
General Comments 0
You need to be logged in to leave comments. Login now