Cleanup and fixes after merge.

IPython/frontend/qt/console/ipython_widget.py

@@ -64,13 +64,14 b' class IPythonWidget(FrontendWidget):'
     # 'BaseFrontendMixin' abstract interface
     #---------------------------------------------------------------------------
 
-    def _handle_pyout(self, msg):
+    def _handle_pyout(self, omsg):
         """ Reimplemented for IPython-style "display hook".
         """
-        self._append_html(self._make_out_prompt(self._prompt_count))
+        prompt_number = omsg['content']['prompt_number']
+        data = omsg['content']['data']
+        self._append_html(self._make_out_prompt(prompt_number))
         self._save_prompt_block()
-        
-        self._append_plain_text(msg['content']['data'] + '\n')
+        self._append_plain_text(data + '\n')
 
     #---------------------------------------------------------------------------
     # 'FrontendWidget' interface
@@ -132,37 +133,6 b' class IPythonWidget(FrontendWidget):'
         self._set_continuation_prompt(
             self._make_continuation_prompt(self._prompt), html=True)
 
-    #------ Signal handlers ----------------------------------------------------
-
-    def _handle_execute_error(self, reply):
-        """ Reimplemented for IPython-style traceback formatting.
-        """
-        content = reply['content']
-        traceback_lines = content['traceback'][:]
-        traceback = ''.join(traceback_lines)
-        traceback = traceback.replace(' ', ' ')
-        traceback = traceback.replace('\n', '<br/>')
-
-        ename = content['ename']
-        ename_styled = '<span class="error">%s</span>' % ename
-        traceback = traceback.replace(ename, ename_styled)
-
-        self._append_html(traceback)
-
-    def _handle_pyout(self, omsg):
-        """ Reimplemented for IPython-style "display hook".
-        """
-        # self._append_html(self._make_out_prompt(self._prompt_count))
-        # TODO: Also look at the output_sep, output_sep2 keys of content. 
-        # They are used in terminal based frontends to add empty spaces before
-        # and after the Out[]: prompt. I doubt you want to use them, but they
-        # are there. I am thinking we should even take them out of the msg.
-        prompt_number = omsg['content']['prompt_number']
-        data = omsg['content']['data']
-        self._append_html(self._make_out_prompt(prompt_number))
-        self._save_prompt_block()
-        self._append_plain_text(data + '\n')
-
     #---------------------------------------------------------------------------
     # 'IPythonWidget' interface
     #---------------------------------------------------------------------------

IPython/zmq/ipkernel.py

@@ -16,11 +16,6 b' Things to do:'
 
 # Standard library imports.
 import __builtin__
-<<<<<<< HEAD
-from code import CommandCompiler
-=======
-import os
->>>>>>> 7425745bce7a04ad0dce41b22f03bebe1d2cdd20
 import sys
 import time
 import traceback
@@ -34,6 +29,7 b' from IPython.utils.traitlets import Instance'
 from completer import KernelCompleter
 from entry_point import base_launch_kernel, make_argument_parser, make_kernel, \
     start_kernel
+from iostream import OutStream
 from session import Session, Message
 from zmqshell import ZMQInteractiveShell
 
@@ -390,7 +386,7 b" given, the GUI backend is matplotlib's, otherwise use one of: \\"
 ['tk', 'gtk', 'qt', 'wx', 'payload-svg'].")
     namespace = parser.parse_args()
 
-    kernel = make_kernel(namespace, Kernel)
+    kernel = make_kernel(namespace, Kernel, OutStream)
     if namespace.pylab:
         if namespace.pylab == 'auto':
             kernel.activate_pylab()