Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions notebook/base/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,6 @@ def kernel_manager(self):
def contents_manager(self):
return self.settings['contents_manager']

@property
def cluster_manager(self):
return self.settings['cluster_manager']

@property
def session_manager(self):
return self.settings['session_manager']
Expand Down
21 changes: 4 additions & 17 deletions notebook/notebookapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
from .services.config import ConfigManager
from .services.contents.manager import ContentsManager
from .services.contents.filemanager import FileContentsManager
from .services.clusters.clustermanager import ClusterManager
from .services.sessions.sessionmanager import SessionManager

from .auth.login import LoginHandler
Expand Down Expand Up @@ -134,20 +133,20 @@ def get(self, url_path):
class NotebookWebApplication(web.Application):

def __init__(self, ipython_app, kernel_manager, contents_manager,
cluster_manager, session_manager, kernel_spec_manager,
session_manager, kernel_spec_manager,
config_manager, log,
base_url, default_url, settings_overrides, jinja_env_options):

settings = self.init_settings(
ipython_app, kernel_manager, contents_manager, cluster_manager,
ipython_app, kernel_manager, contents_manager,
session_manager, kernel_spec_manager, config_manager, log, base_url,
default_url, settings_overrides, jinja_env_options)
handlers = self.init_handlers(settings)

super(NotebookWebApplication, self).__init__(handlers, **settings)

def init_settings(self, ipython_app, kernel_manager, contents_manager,
cluster_manager, session_manager, kernel_spec_manager,
session_manager, kernel_spec_manager,
config_manager,
log, base_url, default_url, settings_overrides,
jinja_env_options=None):
Expand Down Expand Up @@ -197,7 +196,6 @@ def init_settings(self, ipython_app, kernel_manager, contents_manager,
# managers
kernel_manager=kernel_manager,
contents_manager=contents_manager,
cluster_manager=cluster_manager,
session_manager=session_manager,
kernel_spec_manager=kernel_spec_manager,
config_manager=config_manager,
Expand Down Expand Up @@ -233,7 +231,6 @@ def init_handlers(self, settings):
handlers.extend(load_handlers('services.config.handlers'))
handlers.extend(load_handlers('services.kernels.handlers'))
handlers.extend(load_handlers('services.contents.handlers'))
handlers.extend(load_handlers('services.clusters.handlers'))
handlers.extend(load_handlers('services.sessions.handlers'))
handlers.extend(load_handlers('services.nbconvert.handlers'))
handlers.extend(load_handlers('services.kernelspecs.handlers'))
Expand Down Expand Up @@ -661,11 +658,6 @@ def _mathjax_url_changed(self, name, old, new):
config=True,
help='The session manager class to use.'
)
cluster_manager_class = Type(
default_value=ClusterManager,
config=True,
help='The cluster manager class to use.'
)

config_manager_class = Type(
default_value=ConfigManager,
Expand Down Expand Up @@ -803,11 +795,6 @@ def init_configurables(self):
kernel_manager=self.kernel_manager,
contents_manager=self.contents_manager,
)
self.cluster_manager = self.cluster_manager_class(
parent=self,
log=self.log,
)

self.config_manager = self.config_manager_class(
parent=self,
log=self.log,
Expand Down Expand Up @@ -841,7 +828,7 @@ def init_webapp(self):

self.web_app = NotebookWebApplication(
self, self.kernel_manager, self.contents_manager,
self.cluster_manager, self.session_manager, self.kernel_spec_manager,
self.session_manager, self.kernel_spec_manager,
self.config_manager,
self.log, self.base_url, self.default_url, self.tornado_settings,
self.jinja_environment_options
Expand Down
Empty file.
172 changes: 0 additions & 172 deletions notebook/services/clusters/clustermanager.py

This file was deleted.

59 changes: 0 additions & 59 deletions notebook/services/clusters/handlers.py

This file was deleted.

Loading