mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-27 04:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6686 from minrk/default-kernel

Browse Source 
use default kernel name in kernels service
This commit is contained in:
Thomas Kluyver 2014-10-13 13:57:44 -07:00
commit 74d2ddf751
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IPython/html/services/kernels/handlers.py
View File

@ -27,16 +27,16 @@ class MainKernelHandler(IPythonHandler):
@web.authenticated
@json_errors
def post(self):
km = self.kernel_manager
model = self.get_json_body()
if model is None:
raise web.HTTPError(400, "No JSON data provided")
try:
name = model['name']
except KeyError:
raise web.HTTPError(400, "Missing field in JSON data: name")
model = {
'name': km.default_kernel_name
}
else:
model.setdefault('name', km.default_kernel_name)
km = self.kernel_manager
kernel_id = km.start_kernel(kernel_name=name)
kernel_id = km.start_kernel(kernel_name=model['name'])
model = km.kernel_model(kernel_id)
location = url_path_join(self.base_url, 'api', 'kernels', kernel_id)
self.set_header('Location', url_escape(location))

10
IPython/html/services/kernels/tests/test_kernels_api.py
View File

@ -57,6 +57,16 @@ class KernelAPITest(NotebookTestBase):
kernels = self.kern_api.list().json()
self.assertEqual(kernels, [])
def test_default_kernel(self):
# POST request
r = self.kern_api._req('POST', '')
kern1 = r.json()
self.assertEqual(r.headers['location'], '/api/kernels/' + kern1['id'])
self.assertEqual(r.status_code, 201)
self.assertIsInstance(kern1, dict)
self.assertEqual(r.headers['x-frame-options'], "SAMEORIGIN")
def test_main_kernel_handler(self):
# POST request
r = self.kern_api.start()