##// END OF EJS Templates
json_clean zmqshell replies...
MinRK -
Show More
@@ -30,6 +30,7 b' from IPython.core.macro import Macro'
30 from IPython.core.magic import MacroToEdit
30 from IPython.core.magic import MacroToEdit
31 from IPython.core.payloadpage import install_payload_page
31 from IPython.core.payloadpage import install_payload_page
32 from IPython.utils import io
32 from IPython.utils import io
33 from IPython.utils.jsonutil import json_clean
33 from IPython.utils.path import get_py_filename
34 from IPython.utils.path import get_py_filename
34 from IPython.utils.traitlets import Instance, Type, Dict, CBool
35 from IPython.utils.traitlets import Instance, Type, Dict, CBool
35 from IPython.utils.warn import warn
36 from IPython.utils.warn import warn
@@ -69,7 +70,7 b' class ZMQDisplayPublisher(DisplayPublisher):'
69 content['data'] = data
70 content['data'] = data
70 content['metadata'] = metadata
71 content['metadata'] = metadata
71 self.session.send(
72 self.session.send(
72 self.pub_socket, u'display_data', content,
73 self.pub_socket, u'display_data', json_clean(content),
73 parent=self.parent_header
74 parent=self.parent_header
74 )
75 )
75
76
@@ -144,7 +145,7 b' class ZMQInteractiveShell(InteractiveShell):'
144 dh = self.displayhook
145 dh = self.displayhook
145 # Send exception info over pub socket for other clients than the caller
146 # Send exception info over pub socket for other clients than the caller
146 # to pick up
147 # to pick up
147 exc_msg = dh.session.send(dh.pub_socket, u'pyerr', exc_content, dh.parent_header)
148 exc_msg = dh.session.send(dh.pub_socket, u'pyerr', json_clean(exc_content), dh.parent_header)
148
149
149 # FIXME - Hack: store exception info in shell object. Right now, the
150 # FIXME - Hack: store exception info in shell object. Right now, the
150 # caller is reading this info after the fact, we need to fix this logic
151 # caller is reading this info after the fact, we need to fix this logic
General Comments 0
You need to be logged in to leave comments. Login now