mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-30 12:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor notebookapp __init__ method.

Browse Source
This commit is contained in:
Brian E. Granger 2013-05-15 14:51:20 -07:00
parent d3a3adf668
commit 55243f1c1b
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
IPython/frontend/html/notebook/notebookapp.py
View File

@ -134,20 +134,16 @@ class NotebookWebApplication(web.Application):
cluster_manager, log,
base_project_url, settings_overrides):
# Load the (URL pattern, handler) tuples for each component.
handlers = []
handlers.extend(load_handlers('base.handlers'))
handlers.extend(load_handlers('tree.handlers'))
handlers.extend(load_handlers('auth.login'))
handlers.extend(load_handlers('auth.logout'))
handlers.extend(load_handlers('notebooks.handlers'))
handlers.extend(load_handlers('kernels.apihandlers'))
handlers.extend(load_handlers('notebooks.apihandlers'))
handlers.extend(load_handlers('clusters.apihandlers'))
handlers.extend([
(r"/files/(.*)", AuthenticatedFileHandler, {'path' : notebook_manager.notebook_dir}),
])
settings = self.init_settings(
ipython_app, kernel_manager, notebook_manager, cluster_manager,
log, base_project_url, settings_overrides)
handlers = self.init_handlers(settings)
super(NotebookWebApplication, self).__init__(handlers, **settings)
def init_settings(self, ipython_app, kernel_manager, notebook_manager,
cluster_manager, log,
base_project_url, settings_overrides):
# Python < 2.6.5 doesn't accept unicode keys in f(**kwargs), and
# base_project_url will always be unicode, which will in turn
# make the patterns unicode, and ultimately result in unicode
@ -189,15 +185,29 @@ class NotebookWebApplication(web.Application):
# allow custom overrides for the tornado web app.
settings.update(settings_overrides)
return settings
def init_handlers(self, settings):
# Load the (URL pattern, handler) tuples for each component.
handlers = []
handlers.extend(load_handlers('base.handlers'))
handlers.extend(load_handlers('tree.handlers'))
handlers.extend(load_handlers('auth.login'))
handlers.extend(load_handlers('auth.logout'))
handlers.extend(load_handlers('notebooks.handlers'))
handlers.extend(load_handlers('kernels.apihandlers'))
handlers.extend(load_handlers('notebooks.apihandlers'))
handlers.extend(load_handlers('clusters.apihandlers'))
handlers.extend([
(r"/files/(.*)", AuthenticatedFileHandler, {'path' : settings['notebook_manager'].notebook_dir}),
])
# prepend base_project_url onto the patterns that we match
new_handlers = []
for handler in handlers:
pattern = url_path_join(base_project_url, handler[0])
pattern = url_path_join(settings['base_project_url'], handler[0])
new_handler = tuple([pattern] + list(handler[1:]))
new_handlers.append(new_handler)
super(NotebookWebApplication, self).__init__(new_handlers, **settings)
return new_handlers