Show More
@@ -108,6 +108,14 b' aliases.update(app_aliases)' | |||||
108 | # IPythonConsole |
|
108 | # IPythonConsole | |
109 | #----------------------------------------------------------------------------- |
|
109 | #----------------------------------------------------------------------------- | |
110 |
|
110 | |||
|
111 | classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session] | |||
|
112 | ||||
|
113 | try: | |||
|
114 | from IPython.zmq.pylab.backend_inline import InlineBackend | |||
|
115 | except ImportError: | |||
|
116 | pass | |||
|
117 | else: | |||
|
118 | classes.append(InlineBackend) | |||
111 |
|
119 | |||
112 | class IPythonConsoleApp(Configurable): |
|
120 | class IPythonConsoleApp(Configurable): | |
113 | name = 'ipython-console-mixin' |
|
121 | name = 'ipython-console-mixin' | |
@@ -130,7 +138,7 b' class IPythonConsoleApp(Configurable):' | |||||
130 |
|
138 | |||
131 | """ |
|
139 | """ | |
132 |
|
140 | |||
133 | classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session] |
|
141 | classes = classes | |
134 | flags = Dict(flags) |
|
142 | flags = Dict(flags) | |
135 | aliases = Dict(aliases) |
|
143 | aliases = Dict(aliases) | |
136 | kernel_manager_class = BlockingKernelManager |
|
144 | kernel_manager_class = BlockingKernelManager |
@@ -56,6 +56,7 b' from .clustermanager import ClusterManager' | |||||
56 | from IPython.config.application import catch_config_error, boolean_flag |
|
56 | from IPython.config.application import catch_config_error, boolean_flag | |
57 | from IPython.core.application import BaseIPythonApplication |
|
57 | from IPython.core.application import BaseIPythonApplication | |
58 | from IPython.core.profiledir import ProfileDir |
|
58 | from IPython.core.profiledir import ProfileDir | |
|
59 | from IPython.frontend.consoleapp import IPythonConsoleApp | |||
59 | from IPython.lib.kernel import swallow_argv |
|
60 | from IPython.lib.kernel import swallow_argv | |
60 | from IPython.zmq.session import Session, default_secure |
|
61 | from IPython.zmq.session import Session, default_secure | |
61 | from IPython.zmq.zmqshell import ZMQInteractiveShell |
|
62 | from IPython.zmq.zmqshell import ZMQInteractiveShell | |
@@ -255,8 +256,7 b' class NotebookApp(BaseIPythonApplication):' | |||||
255 | """ |
|
256 | """ | |
256 | examples = _examples |
|
257 | examples = _examples | |
257 |
|
258 | |||
258 | classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session, |
|
259 | classes = IPythonConsoleApp.classes + [MappingKernelManager, NotebookManager] | |
259 | MappingKernelManager, NotebookManager] |
|
|||
260 | flags = Dict(flags) |
|
260 | flags = Dict(flags) | |
261 | aliases = Dict(aliases) |
|
261 | aliases = Dict(aliases) | |
262 |
|
262 |
@@ -165,7 +165,7 b' class IPythonQtConsoleApp(BaseIPythonApplication, IPythonConsoleApp):' | |||||
165 | """ |
|
165 | """ | |
166 | examples = _examples |
|
166 | examples = _examples | |
167 |
|
167 | |||
168 | classes = [IPKernelApp, IPythonWidget, ZMQInteractiveShell, ProfileDir, Session] |
|
168 | classes = [IPythonWidget] + IPythonConsoleApp.classes | |
169 | flags = Dict(flags) |
|
169 | flags = Dict(flags) | |
170 | aliases = Dict(aliases) |
|
170 | aliases = Dict(aliases) | |
171 | frontend_flags = Any(qt_flags) |
|
171 | frontend_flags = Any(qt_flags) |
@@ -96,7 +96,7 b' class ZMQTerminalIPythonApp(TerminalIPythonApp, IPythonConsoleApp):' | |||||
96 | """ |
|
96 | """ | |
97 | examples = _examples |
|
97 | examples = _examples | |
98 |
|
98 | |||
99 |
classes = |
|
99 | classes = [ZMQTerminalInteractiveShell] + IPythonConsoleApp.classes | |
100 | flags = Dict(flags) |
|
100 | flags = Dict(flags) | |
101 | aliases = Dict(aliases) |
|
101 | aliases = Dict(aliases) | |
102 | frontend_aliases = Any(frontend_aliases) |
|
102 | frontend_aliases = Any(frontend_aliases) |
General Comments 0
You need to be logged in to leave comments.
Login now