##// END OF EJS Templates
Merge pull request #2811 from minrk/ipc_defaults...
Merge pull request #2811 from minrk/ipc_defaults Still more KernelManager cleanup Finish up some more work from #2775 closes #2722 - [x] ip/transport configurables only live on KernelManager objects, not ConsoleApp - [x] fix default ipc paths in `ipython kernel` and `ipython notebook` cases - [x] fix ipc file cleanup in a few more cases - [x] add `--transport` alias for all appropriate entry points

File last commit:

r8471:bd40426d
r9245:8c1236c4 merge
Show More
displayhook.py
64 lines | 2.0 KiB | text/x-python | PythonLexer
import __builtin__
import sys
from IPython.core.displayhook import DisplayHook
from IPython.inprocess.socket import SocketABC
from IPython.utils.jsonutil import encode_images
from IPython.utils.traitlets import Instance, Dict
from session import extract_header, Session
class ZMQDisplayHook(object):
"""A simple displayhook that publishes the object's repr over a ZeroMQ
socket."""
topic=None
def __init__(self, session, pub_socket):
self.session = session
self.pub_socket = pub_socket
self.parent_header = {}
def __call__(self, obj):
if obj is None:
return
__builtin__._ = obj
sys.stdout.flush()
sys.stderr.flush()
msg = self.session.send(self.pub_socket, u'pyout', {u'data':repr(obj)},
parent=self.parent_header, ident=self.topic)
def set_parent(self, parent):
self.parent_header = extract_header(parent)
class ZMQShellDisplayHook(DisplayHook):
"""A displayhook subclass that publishes data using ZeroMQ. This is intended
to work with an InteractiveShell instance. It sends a dict of different
representations of the object."""
topic=None
session = Instance(Session)
pub_socket = Instance(SocketABC)
parent_header = Dict({})
def set_parent(self, parent):
"""Set the parent for outbound messages."""
self.parent_header = extract_header(parent)
def start_displayhook(self):
self.msg = self.session.msg(u'pyout', {}, parent=self.parent_header)
def write_output_prompt(self):
"""Write the output prompt."""
self.msg['content']['execution_count'] = self.prompt_count
def write_format_data(self, format_dict):
self.msg['content']['data'] = encode_images(format_dict)
def finish_displayhook(self):
"""Finish up all displayhook activities."""
sys.stdout.flush()
sys.stderr.flush()
self.session.send(self.pub_socket, self.msg, ident=self.topic)
self.msg = None