diff --git a/IPython/frontend/html/notebook/handlers.py b/IPython/frontend/html/notebook/handlers.py index a1f287e..aa07bb8 100644 --- a/IPython/frontend/html/notebook/handlers.py +++ b/IPython/frontend/html/notebook/handlers.py @@ -364,9 +364,9 @@ class KernelActionHandler(AuthenticatedHandler): km.interrupt_kernel(kernel_id) self.set_status(204) if action == 'restart': - new_kernel_id = km.restart_kernel(kernel_id) - data = {'ws_url':self.ws_url,'kernel_id':new_kernel_id} - self.set_header('Location', '/'+new_kernel_id) + km.restart_kernel(kernel_id) + data = {'ws_url':self.ws_url, 'kernel_id':kernel_id} + self.set_header('Location', '/'+kernel_id) self.write(jsonapi.dumps(data)) self.finish() diff --git a/IPython/frontend/html/notebook/kernelmanager.py b/IPython/frontend/html/notebook/kernelmanager.py index 69b3ea8..c456659 100644 --- a/IPython/frontend/html/notebook/kernelmanager.py +++ b/IPython/frontend/html/notebook/kernelmanager.py @@ -350,7 +350,6 @@ class MappingKernelManager(MultiKernelManager): self._check_kernel_id(kernel_id) super(MappingKernelManager, self).restart_kernel(kernel_id) self.log.info("Kernel restarted: %s" % kernel_id) - return kernel_id def create_iopub_stream(self, kernel_id): """Create a new iopub stream.""" diff --git a/IPython/frontend/html/notebook/tests/test_kernelsession.py b/IPython/frontend/html/notebook/tests/test_kernelsession.py index fbe790c..50d2c70 100644 --- a/IPython/frontend/html/notebook/tests/test_kernelsession.py +++ b/IPython/frontend/html/notebook/tests/test_kernelsession.py @@ -12,8 +12,8 @@ class TestKernelManager(TestCase): self.assertTrue(kid in km) self.assertTrue(kid in km.list_kernel_ids()) self.assertEqual(len(km),1) - new_kid = km.restart_kernel(kid) - self.assertTrue(kid, new_kid) + km.restart_kernel(kid) + self.assertTrue(kid in km.list_kernel_ids()) km.interrupt_kernel(kid) km.kill_kernel(kid) self.assertTrue(not kid in km)