##// END OF EJS Templates
zmqshell has handle on Kernel
MinRK -
Show More
@@ -27,14 +27,15 b' class Comm(LoggingConfigurable):'
27 shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
27 shell = Instance('IPython.core.interactiveshell.InteractiveShellABC')
28 def _shell_default(self):
28 def _shell_default(self):
29 return get_ipython()
29 return get_ipython()
30
30 iopub_socket = Any()
31 iopub_socket = Any()
31 def _iopub_socket_default(self):
32 def _iopub_socket_default(self):
32 return self.shell.parent.iopub_socket
33 return self.shell.kernel.iopub_socket
33 session = Instance('IPython.kernel.zmq.session.Session')
34 session = Instance('IPython.kernel.zmq.session.Session')
34 def _session_default(self):
35 def _session_default(self):
35 if self.shell is None:
36 if self.shell is None:
36 return
37 return
37 return self.shell.parent.session
38 return self.shell.kernel.session
38
39
39 target = Unicode('comm')
40 target = Unicode('comm')
40
41
@@ -41,12 +41,12 b' class CommManager(LoggingConfigurable):'
41 return get_ipython()
41 return get_ipython()
42 iopub_socket = Any()
42 iopub_socket = Any()
43 def _iopub_socket_default(self):
43 def _iopub_socket_default(self):
44 return self.shell.parent.iopub_socket
44 return self.shell.kernel.iopub_socket
45 session = Instance('IPython.kernel.zmq.session.Session')
45 session = Instance('IPython.kernel.zmq.session.Session')
46 def _session_default(self):
46 def _session_default(self):
47 if self.shell is None:
47 if self.shell is None:
48 return
48 return
49 return self.shell.parent.session
49 return self.shell.kernel.session
50
50
51 comms = Dict()
51 comms = Dict()
52 targets = Dict()
52 targets = Dict()
@@ -145,6 +145,7 b' class Kernel(Configurable):'
145 profile_dir = self.profile_dir,
145 profile_dir = self.profile_dir,
146 user_module = self.user_module,
146 user_module = self.user_module,
147 user_ns = self.user_ns,
147 user_ns = self.user_ns,
148 kernel = self,
148 )
149 )
149 self.shell.displayhook.session = self.session
150 self.shell.displayhook.session = self.session
150 self.shell.displayhook.pub_socket = self.iopub_socket
151 self.shell.displayhook.pub_socket = self.iopub_socket
@@ -477,6 +477,7 b' class ZMQInteractiveShell(InteractiveShell):'
477 displayhook_class = Type(ZMQShellDisplayHook)
477 displayhook_class = Type(ZMQShellDisplayHook)
478 display_pub_class = Type(ZMQDisplayPublisher)
478 display_pub_class = Type(ZMQDisplayPublisher)
479 data_pub_class = Type(ZMQDataPublisher)
479 data_pub_class = Type(ZMQDataPublisher)
480 kernel = Any()
480
481
481 # Override the traitlet in the parent class, because there's no point using
482 # Override the traitlet in the parent class, because there's no point using
482 # readline for the kernel. Can be removed when the readline code is moved
483 # readline for the kernel. Can be removed when the readline code is moved
General Comments 0
You need to be logged in to leave comments. Login now