##// END OF EJS Templates
Merge pull request #3162 from ivanov/output-stream-kwarg...
Merge pull request #3162 from ivanov/output-stream-kwarg adding stream kwarg to current.new_output This was missing, and made unnecessarily clunky to create output cells of stream type using the nbformat API. Before this commit, you had to do something like from IPython.nbformat import current as c output = c.new_output('stream', the_text) output['stream'] = 'stdout' after this commit from IPython.nbformat import current as c output = c.new_output('stream', the_text, stream='stdout') and actually, that stream= argument defaults to 'stdout' if it isn't given. I modified a test that will break if this functionality is ever removed.

File last commit:

r9375:4d245182
r10190:c3b429bd merge
Show More
blockingkernelmanager.py
54 lines | 2.1 KiB | text/x-python | PythonLexer
""" 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
# Local imports.
from IPython.utils.io import raw_print
from IPython.utils.traitlets import Type
from kernelmanager import InProcessKernelManager, InProcessShellChannel, \
InProcessIOPubChannel, InProcessStdInChannel
from IPython.kernel.blockingkernelmanager import BlockingChannelMixin
#-----------------------------------------------------------------------------
# Blocking kernel manager
#-----------------------------------------------------------------------------
class BlockingInProcessShellChannel(BlockingChannelMixin, InProcessShellChannel):
pass
class BlockingInProcessIOPubChannel(BlockingChannelMixin, InProcessIOPubChannel):
pass
class BlockingInProcessStdInChannel(BlockingChannelMixin, InProcessStdInChannel):
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':
_raw_input = self.manager.kernel._sys_raw_input
prompt = msg['content']['prompt']
raw_print(prompt, end='')
self.input(_raw_input())
class BlockingInProcessKernelManager(InProcessKernelManager):
# The classes to use for the various channels.
shell_channel_class = Type(BlockingInProcessShellChannel)
iopub_channel_class = Type(BlockingInProcessIOPubChannel)
stdin_channel_class = Type(BlockingInProcessStdInChannel)