From 731aebbba8bdc64000839d5d4a309d4a58163bb6 2013-04-24 04:47:45
From: MinRK <benjaminrk@gmail.com>
Date: 2013-04-24 04:47:45
Subject: [PATCH] zmq frontend needs a Client, Manager is optional

---

diff --git a/IPython/frontend/terminal/console/interactiveshell.py b/IPython/frontend/terminal/console/interactiveshell.py
index cc2992c..2607157 100644
--- a/IPython/frontend/terminal/console/interactiveshell.py
+++ b/IPython/frontend/terminal/console/interactiveshell.py
@@ -106,7 +106,7 @@ class ZMQTerminalInteractiveShell(TerminalInteractiveShell):
     )
 
     def __init__(self, *args, **kwargs):
-        self.manager = kwargs.pop('kernel_manager')
+        self.manager = kwargs.pop('kernel_manager', None)
         self.client = kwargs.pop('kernel_client')
         self.session_id = self.client.session.session
         super(ZMQTerminalInteractiveShell, self).__init__(*args, **kwargs)
diff --git a/IPython/frontend/terminal/console/tests/test_image_handler.py b/IPython/frontend/terminal/console/tests/test_image_handler.py
index 5de7195..21f615a 100644
--- a/IPython/frontend/terminal/console/tests/test_image_handler.py
+++ b/IPython/frontend/terminal/console/tests/test_image_handler.py
@@ -10,7 +10,7 @@ import sys
 import unittest
 import base64
 
-from IPython.kernel.kernelmanager import KernelManager
+from IPython.kernel import KernelClient
 from IPython.frontend.terminal.console.interactiveshell \
     import ZMQTerminalInteractiveShell
 from IPython.utils.tempdir import TemporaryDirectory
@@ -26,8 +26,8 @@ SCRIPT_PATH = os.path.join(
 class ZMQTerminalInteractiveShellTestCase(unittest.TestCase):
 
     def setUp(self):
-        km = KernelManager()
-        self.shell = ZMQTerminalInteractiveShell(kernel_manager=km)
+        client = KernelClient()
+        self.shell = ZMQTerminalInteractiveShell(kernel_client=client)
         self.raw = b'dummy data'
         self.mime = 'image/png'
         self.data = {self.mime: base64.encodestring(self.raw).decode('ascii')}