##// END OF EJS Templates
zmq frontend needs a Client, Manager is optional
MinRK -
Show More
@@ -106,7 +106,7 class ZMQTerminalInteractiveShell(TerminalInteractiveShell):
106 )
106 )
107
107
108 def __init__(self, *args, **kwargs):
108 def __init__(self, *args, **kwargs):
109 self.manager = kwargs.pop('kernel_manager')
109 self.manager = kwargs.pop('kernel_manager', None)
110 self.client = kwargs.pop('kernel_client')
110 self.client = kwargs.pop('kernel_client')
111 self.session_id = self.client.session.session
111 self.session_id = self.client.session.session
112 super(ZMQTerminalInteractiveShell, self).__init__(*args, **kwargs)
112 super(ZMQTerminalInteractiveShell, self).__init__(*args, **kwargs)
@@ -10,7 +10,7 import sys
10 import unittest
10 import unittest
11 import base64
11 import base64
12
12
13 from IPython.kernel.kernelmanager import KernelManager
13 from IPython.kernel import KernelClient
14 from IPython.frontend.terminal.console.interactiveshell \
14 from IPython.frontend.terminal.console.interactiveshell \
15 import ZMQTerminalInteractiveShell
15 import ZMQTerminalInteractiveShell
16 from IPython.utils.tempdir import TemporaryDirectory
16 from IPython.utils.tempdir import TemporaryDirectory
@@ -26,8 +26,8 SCRIPT_PATH = os.path.join(
26 class ZMQTerminalInteractiveShellTestCase(unittest.TestCase):
26 class ZMQTerminalInteractiveShellTestCase(unittest.TestCase):
27
27
28 def setUp(self):
28 def setUp(self):
29 km = KernelManager()
29 client = KernelClient()
30 self.shell = ZMQTerminalInteractiveShell(kernel_manager=km)
30 self.shell = ZMQTerminalInteractiveShell(kernel_client=client)
31 self.raw = b'dummy data'
31 self.raw = b'dummy data'
32 self.mime = 'image/png'
32 self.mime = 'image/png'
33 self.data = {self.mime: base64.encodestring(self.raw).decode('ascii')}
33 self.data = {self.mime: base64.encodestring(self.raw).decode('ascii')}
General Comments 0
You need to be logged in to leave comments. Login now