##// END OF EJS Templates
more DRYing out of consoleapp
Paul Ivanov -
Show More
@@ -28,7 +28,7 b' from IPython.kernel import tunnel_to_kernel, find_connection_file, swallow_argv'
28 from IPython.kernel.kernelspec import NoSuchKernel
28 from IPython.kernel.kernelspec import NoSuchKernel
29 from IPython.utils.path import filefind
29 from IPython.utils.path import filefind
30 from IPython.utils.traitlets import (
30 from IPython.utils.traitlets import (
31 Dict, List, Unicode, CUnicode, Int, CBool, Any
31 Dict, List, Unicode, CUnicode, CBool, Any
32 )
32 )
33 from IPython.kernel.zmq.kernelapp import (
33 from IPython.kernel.zmq.kernelapp import (
34 kernel_flags,
34 kernel_flags,
@@ -144,21 +144,6 b' class IPythonConsoleApp(ConnectionFileMixin):'
144 sshkey = Unicode('', config=True,
144 sshkey = Unicode('', config=True,
145 help="""Path to the ssh key to use for logging in to the ssh server.""")
145 help="""Path to the ssh key to use for logging in to the ssh server.""")
146
146
147 hb_port = Int(0, config=True,
148 help="set the heartbeat port [default: random]")
149 shell_port = Int(0, config=True,
150 help="set the shell (ROUTER) port [default: random]")
151 iopub_port = Int(0, config=True,
152 help="set the iopub (PUB) port [default: random]")
153 stdin_port = Int(0, config=True,
154 help="set the stdin (DEALER) port [default: random]")
155 connection_file = Unicode('', config=True,
156 help="""JSON file in which to store connection info [default: kernel-<pid>.json]
157
158 This file will contain the IP, ports, and authentication key needed to connect
159 clients to this kernel. By default, this file will be created in the security-dir
160 of the current profile, but can be specified by absolute path.
161 """)
162 def _connection_file_default(self):
147 def _connection_file_default(self):
163 return 'kernel-%i.json' % os.getpid()
148 return 'kernel-%i.json' % os.getpid()
164
149
@@ -419,11 +419,16 b' class ConnectionFileMixin(Configurable):'
419
419
420 # protected traits
420 # protected traits
421
421
422 hb_port = Integer(0, config=True, help="set the heartbeat port [default: random]")
422 hb_port = Integer(0, config=True,
423 shell_port = Integer(0, config=True, help="set the shell (ROUTER) port [default: random]")
423 help="set the heartbeat port [default: random]")
424 iopub_port = Integer(0, config=True, help="set the iopub (PUB) port [default: random]")
424 shell_port = Integer(0, config=True,
425 stdin_port = Integer(0, config=True, help="set the stdin (ROUTER) port [default: random]")
425 help="set the shell (ROUTER) port [default: random]")
426 control_port = Integer(0, config=True, help="set the control (ROUTER) port [default: random]")
426 iopub_port = Integer(0, config=True,
427 help="set the iopub (PUB) port [default: random]")
428 stdin_port = Integer(0, config=True,
429 help="set the stdin (ROUTER) port [default: random]")
430 control_port = Integer(0, config=True,
431 help="set the control (ROUTER) port [default: random]")
427
432
428 @property
433 @property
429 def ports(self):
434 def ports(self):
General Comments 0
You need to be logged in to leave comments. Login now