mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-23 12:49:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

manual rebase notebookapp.py

Browse Source
This commit is contained in:
Zachary Sailer 2013-07-03 10:31:49 -07:00 committed by MinRK
parent 72ec51128d
commit f998dae05f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IPython/html/notebookapp.py
View File

@ -65,6 +65,7 @@ from .services.kernels.kernelmanager import MappingKernelManager
from .services.notebooks.nbmanager import NotebookManager from .services.notebooks.nbmanager import NotebookManager
from .services.notebooks.filenbmanager import FileNotebookManager from .services.notebooks.filenbmanager import FileNotebookManager
from .services.clusters.clustermanager import ClusterManager from .services.clusters.clustermanager import ClusterManager
from .services.sessions.sessionmanager import SessionManager
from .base.handlers import AuthenticatedFileHandler, FileFindHandler from .base.handlers import AuthenticatedFileHandler, FileFindHandler
@ -127,18 +128,18 @@ def load_handlers(name):
class NotebookWebApplication(web.Application): class NotebookWebApplication(web.Application):
def __init__(self, ipython_app, kernel_manager, notebook_manager, def __init__(self, ipython_app, kernel_manager, notebook_manager,
cluster_manager, log, cluster_manager, session_manager, log,
base_project_url, settings_overrides): base_project_url, settings_overrides):
settings = self.init_settings( settings = self.init_settings(
ipython_app, kernel_manager, notebook_manager, cluster_manager, ipython_app, kernel_manager, notebook_manager, cluster_manager,
log, base_project_url, settings_overrides) session_manager, log, base_project_url, settings_overrides)
handlers = self.init_handlers(settings) handlers = self.init_handlers(settings)
super(NotebookWebApplication, self).__init__(handlers, **settings) super(NotebookWebApplication, self).__init__(handlers, **settings)
def init_settings(self, ipython_app, kernel_manager, notebook_manager, def init_settings(self, ipython_app, kernel_manager, notebook_manager,
cluster_manager, log, cluster_manager, session_manager, log,
base_project_url, settings_overrides): base_project_url, settings_overrides):
# Python < 2.6.5 doesn't accept unicode keys in f(**kwargs), and # Python < 2.6.5 doesn't accept unicode keys in f(**kwargs), and
# base_project_url will always be unicode, which will in turn # base_project_url will always be unicode, which will in turn
@ -168,6 +169,7 @@ class NotebookWebApplication(web.Application):
kernel_manager=kernel_manager, kernel_manager=kernel_manager,
notebook_manager=notebook_manager, notebook_manager=notebook_manager,
cluster_manager=cluster_manager, cluster_manager=cluster_manager,
session_manager=session_manager,
# IPython stuff # IPython stuff
nbextensions_path = ipython_app.nbextensions_path, nbextensions_path = ipython_app.nbextensions_path,
@ -192,6 +194,7 @@ class NotebookWebApplication(web.Application):
handlers.extend(load_handlers('services.kernels.handlers')) handlers.extend(load_handlers('services.kernels.handlers'))
handlers.extend(load_handlers('services.notebooks.handlers')) handlers.extend(load_handlers('services.notebooks.handlers'))
handlers.extend(load_handlers('services.clusters.handlers')) handlers.extend(load_handlers('services.clusters.handlers'))
handlers.extend(load_handlers('services.sessions.handlers'))
handlers.extend([ handlers.extend([
(r"/files/(.*)", AuthenticatedFileHandler, {'path' : settings['notebook_manager'].notebook_dir}), (r"/files/(.*)", AuthenticatedFileHandler, {'path' : settings['notebook_manager'].notebook_dir}),
(r"/nbextensions/(.*)", FileFindHandler, {'path' : settings['nbextensions_path']}), (r"/nbextensions/(.*)", FileFindHandler, {'path' : settings['nbextensions_path']}),
@ -523,7 +526,8 @@ class NotebookApp(BaseIPythonApplication):
) )
kls = import_item(self.notebook_manager_class) kls = import_item(self.notebook_manager_class)
self.notebook_manager = kls(parent=self, log=self.log) self.notebook_manager = kls(parent=self, log=self.log)
self.notebook_manager.load_notebook_names() self.notebook_manager.load_notebook_names('')
self.session_manager = SessionManager(parent=self, log=self.log)
self.cluster_manager = ClusterManager(parent=self, log=self.log) self.cluster_manager = ClusterManager(parent=self, log=self.log)
self.cluster_manager.update_profiles() self.cluster_manager.update_profiles()
@ -541,8 +545,8 @@ class NotebookApp(BaseIPythonApplication):
"""initialize tornado webapp and httpserver""" """initialize tornado webapp and httpserver"""
self.web_app = NotebookWebApplication( self.web_app = NotebookWebApplication(
self, self.kernel_manager, self.notebook_manager, self, self.kernel_manager, self.notebook_manager,
self.cluster_manager, self.log, self.cluster_manager, self.session_manager, self.log,
self.base_project_url, self.webapp_settings, self.base_project_url, self.webapp_settings
) )
if self.certfile: if self.certfile:
ssl_options = dict(certfile=self.certfile) ssl_options = dict(certfile=self.certfile)