Merge pull request Calysto#88 from minrk/text-output

wrap output in TextOutput in ProcessMetaKernel

metakernel/process_metakernel.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 from . import MetaKernel
 from .pexpect import EOF
-from .replwrap import REPLWrapper, u, PY3
+from .replwrap import REPLWrapper, u
 from subprocess import check_output
 import os
 import re
@@ -11,6 +11,18 @@
 version_pat = re.compile(r'version (\d+(\.\d+)+)')
 
 
+class TextOutput(object):
+    """Wrapper for text output whose repr is the text itself.
+    
+    This avoids `repr(output)` adding quotation marks around already-rendered text.
+    """
+    def __init__(self, output):
+        self.output = output
+
+    def __repr__(self):
+        return self.output
+
+
 class ProcessMetaKernel(MetaKernel):
     implementation = 'process_kernel'
     implementation_version = __version__
@@ -38,7 +50,6 @@ def banner(self):
     def __init__(self, **kwargs):
         MetaKernel.__init__(self, **kwargs)
         self.wrapper = None
-        self.repr = str if PY3 else lambda x: x.encode('utf-8')
         self._start()
 
     def _start(self):
@@ -91,7 +102,7 @@ def do_execute_direct(self, code, stream_handler=None):
                             'execution_count': self.execution_count,
                             'payload': [], 'user_expressions': {}}
 
-        return output
+        return TextOutput(output)
 
     def check_exitcode(self):
         """

metakernel/tests/test_process_metakernel.py

@@ -1,4 +1,6 @@
 
+from IPython.display import HTML
+
 from metakernel.tests.utils import get_kernel, get_log_text
 from metakernel.process_metakernel import BashKernel
 
@@ -17,3 +19,6 @@ def test_process_metakernel():
     kernel.do_execute('lalkjds')
     text = get_log_text(kernel)
     assert ': command not found' in text, text
+
+    html = HTML("some html")
+    kernel.Display(html)