##// END OF EJS Templates
move _encode_binary to jsonutil.encode_images...
move _encode_binary to jsonutil.encode_images And fix identification of PNG/JPEG data, which could be double-encoded when using a JSON library that decodes to str instead of unicode (simplejson 2.6, for instance). Changes are tested.

File last commit:

r7737:00142486
r7737:00142486
Show More
displayhook.py
63 lines | 2.0 KiB | text/x-python | PythonLexer
Brian Granger
Separating kernel into smaller pieces.
r2754 import __builtin__
MinRK
flush stdout/stderr on displayhook...
r4792 import sys
Brian Granger
Separating kernel into smaller pieces.
r2754
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067 from IPython.core.displayhook import DisplayHook
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 from IPython.utils.jsonutil import encode_images
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067 from IPython.utils.traitlets import Instance, Dict
from session import extract_header, Session
Brian Granger
Separating kernel into smaller pieces.
r2754
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067 class ZMQDisplayHook(object):
"""A simple displayhook that publishes the object's repr over a ZeroMQ
socket."""
MinRK
propagate iopub to clients
r3602 topic=None
Brian Granger
Separating kernel into smaller pieces.
r2754 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
MinRK
flush stdout/stderr on displayhook...
r4792 sys.stdout.flush()
sys.stderr.flush()
MinRK
all sends/recvs now via Session.send/recv....
r3269 msg = self.session.send(self.pub_socket, u'pyout', {u'data':repr(obj)},
MinRK
propagate iopub to clients
r3602 parent=self.parent_header, ident=self.topic)
Brian Granger
Separating kernel into smaller pieces.
r2754
def set_parent(self, parent):
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067 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."""
MinRK
fix topic on displayhook in ZMQShell
r6814 topic=None
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067
session = Instance(Session)
pub_socket = Instance('zmq.Socket')
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."""
MinRK
prompt_count should be unconditional in pyout messages
r6693 self.msg['content']['execution_count'] = self.prompt_count
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067
def write_format_data(self, format_dict):
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 self.msg['content']['data'] = encode_images(format_dict)
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067
def finish_displayhook(self):
"""Finish up all displayhook activities."""
MinRK
flush stdout/stderr on displayhook...
r4792 sys.stdout.flush()
sys.stderr.flush()
MinRK
fix topic on displayhook in ZMQShell
r6814 self.session.send(self.pub_socket, self.msg, ident=self.topic)
Thomas Kluyver
Move displayhook for ZMQ shell to zmq.displayhook, and rename to make the difference clearer.
r4067 self.msg = None
Brian E. Granger
Finishing display system work....
r4528