##// END OF EJS Templates
Removing return value of restart_kernel....
Removing return value of restart_kernel. The kernel_id is *always* the same under a restart and there is no need to return it. The restart handler does pass the original kernel_id back to the browser as it currently uses it.

File last commit:

r8940:36f98b60
r9113:9bb3bea0
Show More
blockingkernelmanager.py
87 lines | 3.1 KiB | text/x-python | PythonLexer
/ IPython / inprocess / blockingkernelmanager.py
epatters
Refactor kernel managers in preparation for the EmbeddedKernel.
r8408 """ Implements a fully blocking kernel manager.
Useful for test suites and blocking terminal interfaces.
"""
#-----------------------------------------------------------------------------
# Copyright (C) 2012 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING.txt, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
from __future__ import print_function
# Standard library imports.
import Queue
from threading import Event
# Local imports.
epatters
BUG: raw_input logic incorrect for in-process terminal frontend.
r8482 from IPython.utils.io import raw_print
epatters
Refactor kernel managers in preparation for the EmbeddedKernel.
r8408 from IPython.utils.traitlets import Type
epatters
REFACTOR: Terminology change: 'embedded' -> 'in-process'.
r8471 from kernelmanager import InProcessKernelManager, ShellInProcessChannel, \
SubInProcessChannel, StdInInProcessChannel
epatters
Refactor kernel managers in preparation for the EmbeddedKernel.
r8408
#-----------------------------------------------------------------------------
# Utility classes
#-----------------------------------------------------------------------------
class BlockingChannelMixin(object):
def __init__(self, *args, **kwds):
super(BlockingChannelMixin, self).__init__(*args, **kwds)
self._in_queue = Queue.Queue()
def call_handlers(self, msg):
self._in_queue.put(msg)
def get_msg(self, block=True, timeout=None):
""" Gets a message if there is one that is ready. """
return self._in_queue.get(block, timeout)
def get_msgs(self):
""" Get all messages that are currently ready. """
msgs = []
while True:
try:
msgs.append(self.get_msg(block=False))
except Queue.Empty:
break
return msgs
def msg_ready(self):
""" Is there a message that has been received? """
return not self._in_queue.empty()
#-----------------------------------------------------------------------------
# Blocking kernel manager
#-----------------------------------------------------------------------------
epatters
REFACTOR: Terminology change: 'embedded' -> 'in-process'.
r8471 class BlockingShellInProcessChannel(BlockingChannelMixin, ShellInProcessChannel):
epatters
Refactor kernel managers in preparation for the EmbeddedKernel.
r8408 pass
epatters
REFACTOR: Terminology change: 'embedded' -> 'in-process'.
r8471 class BlockingSubInProcessChannel(BlockingChannelMixin, SubInProcessChannel):
epatters
Refactor kernel managers in preparation for the EmbeddedKernel.
r8408 pass
epatters
REFACTOR: Terminology change: 'embedded' -> 'in-process'.
r8471 class BlockingStdInInProcessChannel(BlockingChannelMixin, StdInInProcessChannel):
epatters
BUG: raw_input logic incorrect for in-process terminal frontend.
r8482
def call_handlers(self, msg):
""" Overridden for the in-process channel.
This methods simply calls raw_input directly.
"""
msg_type = msg['header']['msg_type']
if msg_type == 'input_request':
Pietro Berkes
BUG: Solve 2to3 conversion error....
r8940 _raw_input = self.manager.kernel._sys_raw_input
epatters
BUG: raw_input logic incorrect for in-process terminal frontend.
r8482 prompt = msg['content']['prompt']
raw_print(prompt, end='')
Pietro Berkes
BUG: Solve 2to3 conversion error....
r8940 self.input(_raw_input())
epatters
Refactor kernel managers in preparation for the EmbeddedKernel.
r8408
epatters
REFACTOR: Terminology change: 'embedded' -> 'in-process'.
r8471 class BlockingInProcessKernelManager(InProcessKernelManager):
epatters
Refactor kernel managers in preparation for the EmbeddedKernel.
r8408
# The classes to use for the various channels.
epatters
REFACTOR: Terminology change: 'embedded' -> 'in-process'.
r8471 shell_channel_class = Type(BlockingShellInProcessChannel)
sub_channel_class = Type(BlockingSubInProcessChannel)
stdin_channel_class = Type(BlockingStdInInProcessChannel)