fix in process qt and in process examples

IPython/frontend/qt/inprocess.py

@@ -1,34 +1,40 b''
 """ Defines an in-process KernelManager with signals and slots.
 """
 
 # Local imports.
 from IPython.kernel.inprocess import (
     InProcessShellChannel, InProcessIOPubChannel, InProcessStdInChannel,
-    InProcessHBChannel, InProcessKernelClient
+    InProcessHBChannel, InProcessKernelClient, InProcessKernelManager,
 )
 
 from IPython.utils.traitlets import Type
-from kernel_mixins import QtShellChannelMixin, QtIOPubChannelMixin, \
-    QtStdInChannelMixin, QtHBChannelMixin, QtKernelClientMixin
+from .kernel_mixins import (
+    QtShellChannelMixin, QtIOPubChannelMixin,
+    QtStdInChannelMixin, QtHBChannelMixin, QtKernelClientMixin,
+    QtKernelManagerMixin,
+)
 
 
 class QtInProcessShellChannel(QtShellChannelMixin, InProcessShellChannel):
     pass
 
 class QtInProcessIOPubChannel(QtIOPubChannelMixin, InProcessIOPubChannel):
     pass
 
 class QtInProcessStdInChannel(QtStdInChannelMixin, InProcessStdInChannel):
     pass
 
 class QtInProcessHBChannel(QtHBChannelMixin, InProcessHBChannel):
     pass
 
 class QtInProcessKernelClient(QtKernelClientMixin, InProcessKernelClient):
     """ An in-process KernelManager with signals and slots.
     """
 
     iopub_channel_class = Type(QtInProcessIOPubChannel)
     shell_channel_class = Type(QtInProcessShellChannel)
     stdin_channel_class = Type(QtInProcessStdInChannel)
     hb_channel_class = Type(QtInProcessHBChannel)
+
+class QtInProcessKernelManager(QtKernelManagerMixin, InProcessKernelManager):
+    client_class = __module__ + '.QtInProcessKernelClient'

examples/inprocess/embedded_qtconsole.py

@@ -1,46 +1,45 b''
 import os
 
 from IPython.frontend.qt.console.rich_ipython_widget import RichIPythonWidget
-from IPython.frontend.qt.inprocess import QtInProcessKernelClient
-from IPython.kernel.inprocess import InProcessKernelManager
+from IPython.frontend.qt.inprocess import QtInProcessKernelManager
 from IPython.lib import guisupport
 
 
 def print_process_id():
     print 'Process ID is:', os.getpid()
 
 
 def main():
     # Print the ID of the main process
     print_process_id()
 
     app = guisupport.get_app_qt4()
 
     # Create an in-process kernel
     # >>> print_process_id()
     # will print the same process ID as the main process
-    kernel_manager = InProcessKernelManager()
+    kernel_manager = QtInProcessKernelManager()
     kernel_manager.start_kernel()
     kernel = kernel_manager.kernel
     kernel.gui = 'qt4'
     kernel.shell.push({'foo': 43, 'print_process_id': print_process_id})
 
-    kernel_client = QtInProcessKernelClient(kernel=kernel)
+    kernel_client = kernel_manager.client()
     kernel_client.start_channels()
 
     def stop():
         kernel_client.stop_channels()
         kernel_manager.shutdown_kernel()
         app.exit()
 
     control = RichIPythonWidget()
     control.kernel_manager = kernel_manager
     control.kernel_client = kernel_client
     control.exit_requested.connect(stop)
     control.show()
 
     guisupport.start_event_loop_qt4(app)
 
 
 if __name__ == '__main__':
     main()

examples/inprocess/embedded_terminal.py

@@ -1,30 +1,30 b''
 import os
 
 from IPython.kernel.inprocess import InProcessKernelManager
 from IPython.frontend.terminal.console.interactiveshell import ZMQTerminalInteractiveShell
 
 
 def print_process_id():
     print 'Process ID is:', os.getpid()
 
 
 def main():
     print_process_id()
 
     # Create an in-process kernel
     # >>> print_process_id()
     # will print the same process ID as the main process
     kernel_manager = InProcessKernelManager()
     kernel_manager.start_kernel()
     kernel = kernel_manager.kernel
     kernel.gui = 'qt4'
     kernel.shell.push({'foo': 43, 'print_process_id': print_process_id})
     client = kernel_manager.client()
     client.start_channels()
 
-    shell = ZMQTerminalInteractiveShell(kernel_manager=kernel_manager, kernel_client=client)
+    shell = ZMQTerminalInteractiveShell(manager=kernel_manager, client=client)
     shell.mainloop()
 
 
 if __name__ == '__main__':
     main()