##// END OF EJS Templates
only include kernel config in `--help` output...
MinRK -
Show More
@@ -7,11 +7,6 b' refactoring of what used to be the IPython/qt/console/qtconsoleapp.py'
7 # Copyright (c) IPython Development Team.
7 # Copyright (c) IPython Development Team.
8 # Distributed under the terms of the Modified BSD License.
8 # Distributed under the terms of the Modified BSD License.
9
9
10 #-----------------------------------------------------------------------------
11 # Imports
12 #-----------------------------------------------------------------------------
13
14 # stdlib imports
15 import atexit
10 import atexit
16 import os
11 import os
17 import signal
12 import signal
@@ -19,7 +14,6 b' import sys'
19 import uuid
14 import uuid
20
15
21
16
22 # Local imports
23 from IPython.config.application import boolean_flag
17 from IPython.config.application import boolean_flag
24 from IPython.core.profiledir import ProfileDir
18 from IPython.core.profiledir import ProfileDir
25 from IPython.kernel.blocking import BlockingKernelClient
19 from IPython.kernel.blocking import BlockingKernelClient
@@ -40,18 +34,9 b' from IPython.kernel.zmq.session import Session, default_secure'
40 from IPython.kernel.zmq.zmqshell import ZMQInteractiveShell
34 from IPython.kernel.zmq.zmqshell import ZMQInteractiveShell
41 from IPython.kernel.connect import ConnectionFileMixin
35 from IPython.kernel.connect import ConnectionFileMixin
42
36
43 #-----------------------------------------------------------------------------
44 # Network Constants
45 #-----------------------------------------------------------------------------
46
47 from IPython.utils.localinterfaces import localhost
37 from IPython.utils.localinterfaces import localhost
48
38
49 #-----------------------------------------------------------------------------
39 #-----------------------------------------------------------------------------
50 # Globals
51 #-----------------------------------------------------------------------------
52
53
54 #-----------------------------------------------------------------------------
55 # Aliases and Flags
40 # Aliases and Flags
56 #-----------------------------------------------------------------------------
41 #-----------------------------------------------------------------------------
57
42
@@ -98,11 +83,7 b' aliases.update(app_aliases)'
98 # Classes
83 # Classes
99 #-----------------------------------------------------------------------------
84 #-----------------------------------------------------------------------------
100
85
101 #-----------------------------------------------------------------------------
86 classes = [KernelManager, ProfileDir, Session]
102 # IPythonConsole
103 #-----------------------------------------------------------------------------
104
105 classes = [IPKernelApp, ZMQInteractiveShell, KernelManager, ProfileDir, Session, InlineBackend]
106
87
107 class IPythonConsoleApp(ConnectionFileMixin):
88 class IPythonConsoleApp(ConnectionFileMixin):
108 name = 'ipython-console-mixin'
89 name = 'ipython-console-mixin'
@@ -158,8 +139,15 b' class IPythonConsoleApp(ConnectionFileMixin):'
158 Set to display confirmation dialog on exit. You can always use 'exit' or 'quit',
139 Set to display confirmation dialog on exit. You can always use 'exit' or 'quit',
159 to force a direct exit without any confirmation.""",
140 to force a direct exit without any confirmation.""",
160 )
141 )
161
142
162
143 @property
144 def help_classes(self):
145 """ConsoleApps can configure kernels on the command-line
146
147 But this shouldn't be written to a file
148 """
149 return self.classes + [IPKernelApp] + IPKernelApp.classes
150
163 def build_kernel_argv(self, argv=None):
151 def build_kernel_argv(self, argv=None):
164 """build argv to be passed to kernel subprocess"""
152 """build argv to be passed to kernel subprocess"""
165 if argv is None:
153 if argv is None:
General Comments 0
You need to be logged in to leave comments. Login now