##// END OF EJS Templates
Merge pull request #7259 from takluyver/kernelspec-head-error...
Min RK -
r19603:af022ae9 merge
parent child Browse files
Show More
@@ -1,27 +1,27 b''
1 from tornado import web
1 from tornado import web
2 from ..base.handlers import IPythonHandler
2 from ..base.handlers import IPythonHandler
3 from ..services.kernelspecs.handlers import kernel_name_regex
3 from ..services.kernelspecs.handlers import kernel_name_regex
4
4
5 class KernelSpecResourceHandler(web.StaticFileHandler, IPythonHandler):
5 class KernelSpecResourceHandler(web.StaticFileHandler, IPythonHandler):
6 SUPPORTED_METHODS = ('GET', 'HEAD')
6 SUPPORTED_METHODS = ('GET', 'HEAD')
7
7
8 def initialize(self):
8 def initialize(self):
9 web.StaticFileHandler.initialize(self, path='')
9 web.StaticFileHandler.initialize(self, path='')
10
10
11 @web.authenticated
11 @web.authenticated
12 def get(self, kernel_name, path, include_body=True):
12 def get(self, kernel_name, path, include_body=True):
13 ksm = self.kernel_spec_manager
13 ksm = self.kernel_spec_manager
14 try:
14 try:
15 self.root = ksm.get_kernel_spec(kernel_name).resource_dir
15 self.root = ksm.get_kernel_spec(kernel_name).resource_dir
16 except KeyError:
16 except KeyError:
17 raise web.HTTPError(404, u'Kernel spec %s not found' % kernel_name)
17 raise web.HTTPError(404, u'Kernel spec %s not found' % kernel_name)
18 self.log.debug("Serving kernel resource from: %s", self.root)
18 self.log.debug("Serving kernel resource from: %s", self.root)
19 return web.StaticFileHandler.get(self, path, include_body=include_body)
19 return web.StaticFileHandler.get(self, path, include_body=include_body)
20
20
21 @web.authenticated
21 @web.authenticated
22 def head(self, kernel_name, path):
22 def head(self, kernel_name, path):
23 self.get(kernel_name, path, include_body=False)
23 return self.get(kernel_name, path, include_body=False)
24
24
25 default_handlers = [
25 default_handlers = [
26 (r"/kernelspecs/%s/(?P<path>.*)" % kernel_name_regex, KernelSpecResourceHandler),
26 (r"/kernelspecs/%s/(?P<path>.*)" % kernel_name_regex, KernelSpecResourceHandler),
27 ] No newline at end of file
27 ]
General Comments 0
You need to be logged in to leave comments. Login now