From 4e71eda95fabbfe22e18e2c34dc62451d7b686fc 2013-09-04 19:35:40
From: MinRK <benjaminrk@gmail.com>
Date: 2013-09-04 19:35:40
Subject: [PATCH] cleanup in kernel.tests.utils
---

diff --git a/IPython/kernel/tests/utils.py b/IPython/kernel/tests/utils.py
index e39a3b2..a3cd92f 100644
--- a/IPython/kernel/tests/utils.py
+++ b/IPython/kernel/tests/utils.py
@@ -86,7 +86,6 @@ def execute(code='', kc=None, **kwargs):
 def start_global_kernel():
     """start the global kernel (if it isn't running) and return its client"""
     global KM, KC
-    print KM, KC
     if KM is None:
         KM, KC = start_new_kernel()
         atexit.register(stop_global_kernel)
@@ -138,7 +137,7 @@ def new_kernel():
         yield kc
     finally:
         kc.stop_channels()
-        km.shutdown_kernel()
+        km.shutdown_kernel(now=True)
 
 
 def assemble_output(iopub):
@@ -154,9 +153,9 @@ def assemble_output(iopub):
             break
         elif msg['msg_type'] == 'stream':
             if content['name'] == 'stdout':
-                stdout = stdout + content['data']
+                stdout += content['data']
             elif content['name'] == 'stderr':
-                stderr = stderr + content['data']
+                stderr += content['data']
             else:
                 raise KeyError("bad stream: %r" % content['name'])
         else: