diff --git a/IPython/frontend/consoleapp.py b/IPython/frontend/consoleapp.py index 16ae58d..c9fa362 100644 --- a/IPython/frontend/consoleapp.py +++ b/IPython/frontend/consoleapp.py @@ -108,6 +108,14 @@ aliases.update(app_aliases) # IPythonConsole #----------------------------------------------------------------------------- +classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session] + +try: + from IPython.zmq.pylab.backend_inline import InlineBackend +except ImportError: + pass +else: + classes.append(InlineBackend) class IPythonConsoleApp(Configurable): name = 'ipython-console-mixin' @@ -130,7 +138,7 @@ class IPythonConsoleApp(Configurable): """ - classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session] + classes = classes flags = Dict(flags) aliases = Dict(aliases) kernel_manager_class = BlockingKernelManager diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/frontend/html/notebook/notebookapp.py index 4fd7d98..3b49b39 100644 --- a/IPython/frontend/html/notebook/notebookapp.py +++ b/IPython/frontend/html/notebook/notebookapp.py @@ -56,6 +56,7 @@ from .clustermanager import ClusterManager from IPython.config.application import catch_config_error, boolean_flag from IPython.core.application import BaseIPythonApplication from IPython.core.profiledir import ProfileDir +from IPython.frontend.consoleapp import IPythonConsoleApp from IPython.lib.kernel import swallow_argv from IPython.zmq.session import Session, default_secure from IPython.zmq.zmqshell import ZMQInteractiveShell @@ -255,8 +256,7 @@ class NotebookApp(BaseIPythonApplication): """ examples = _examples - classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session, - MappingKernelManager, NotebookManager] + classes = IPythonConsoleApp.classes + [MappingKernelManager, NotebookManager] flags = Dict(flags) aliases = Dict(aliases) diff --git a/IPython/frontend/qt/console/qtconsoleapp.py b/IPython/frontend/qt/console/qtconsoleapp.py index 80ccbd8..5824607 100644 --- a/IPython/frontend/qt/console/qtconsoleapp.py +++ b/IPython/frontend/qt/console/qtconsoleapp.py @@ -165,7 +165,7 @@ class IPythonQtConsoleApp(BaseIPythonApplication, IPythonConsoleApp): """ examples = _examples - classes = [IPKernelApp, IPythonWidget, ZMQInteractiveShell, ProfileDir, Session] + classes = [IPythonWidget] + IPythonConsoleApp.classes flags = Dict(flags) aliases = Dict(aliases) frontend_flags = Any(qt_flags) diff --git a/IPython/frontend/terminal/console/app.py b/IPython/frontend/terminal/console/app.py index 0de7ffe..27f1a55 100644 --- a/IPython/frontend/terminal/console/app.py +++ b/IPython/frontend/terminal/console/app.py @@ -96,7 +96,7 @@ class ZMQTerminalIPythonApp(TerminalIPythonApp, IPythonConsoleApp): """ examples = _examples - classes = List([IPKernelApp, ZMQTerminalInteractiveShell, Session]) + classes = [ZMQTerminalInteractiveShell] + IPythonConsoleApp.classes flags = Dict(flags) aliases = Dict(aliases) frontend_aliases = Any(frontend_aliases)