##// END OF EJS Templates
add qtconsole as subapp of terminal ipapp...
MinRK -
Show More
@@ -206,9 +206,16 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
206 # command_line_loader = IPAppConfigLoader
206 # command_line_loader = IPAppConfigLoader
207 default_config_file_name = default_config_file_name
207 default_config_file_name = default_config_file_name
208 crash_handler_class = IPAppCrashHandler
208 crash_handler_class = IPAppCrashHandler
209
209 flags = Dict(flags)
210 flags = Dict(flags)
210 aliases = Dict(aliases)
211 aliases = Dict(aliases)
211 classes = [InteractiveShellApp, TerminalInteractiveShell, ProfileDir, PlainTextFormatter]
212 classes = [InteractiveShellApp, TerminalInteractiveShell, ProfileDir, PlainTextFormatter]
213 subcommands = Dict(dict(
214 qtconsole=('IPython.frontend.qt.console.ipythonqt.IPythonQtConsoleApp',
215 """Launch the IPython QtConsole. Also launched as ipython-qtconsole"""
216 )
217 ))
218
212 # *do* autocreate requested profile
219 # *do* autocreate requested profile
213 auto_create=Bool(True)
220 auto_create=Bool(True)
214 copy_config_files=Bool(True)
221 copy_config_files=Bool(True)
@@ -259,9 +266,11 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
259 def initialize(self, argv=None):
266 def initialize(self, argv=None):
260 """Do actions after construct, but before starting the app."""
267 """Do actions after construct, but before starting the app."""
261 super(TerminalIPythonApp, self).initialize(argv)
268 super(TerminalIPythonApp, self).initialize(argv)
269 if self.subapp is not None:
270 # don't bother initializing further, starting subapp
271 return
262 if not self.ignore_old_config:
272 if not self.ignore_old_config:
263 check_for_old_config(self.ipython_dir)
273 check_for_old_config(self.ipython_dir)
264
265 # print self.extra_args
274 # print self.extra_args
266 if self.extra_args:
275 if self.extra_args:
267 self.file_to_run = self.extra_args[0]
276 self.file_to_run = self.extra_args[0]
@@ -322,6 +331,8 b' class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):'
322 self.shell.showtraceback()
331 self.shell.showtraceback()
323
332
324 def start(self):
333 def start(self):
334 if self.subapp is not None:
335 return self.subapp.start()
325 # perform any prexec steps:
336 # perform any prexec steps:
326 if self.interact:
337 if self.interact:
327 self.log.debug("Starting IPython's mainloop...")
338 self.log.debug("Starting IPython's mainloop...")
General Comments 0
You need to be logged in to leave comments. Login now