##// END OF EJS Templates
MAINT: Use `Type` instead of `DottedObjectName` for managers....
Scott Sanderson -
Show More
@@ -60,6 +60,7 b' from IPython.html import ('
60 from .base.handlers import Template404
60 from .base.handlers import Template404
61 from .log import log_request
61 from .log import log_request
62 from .services.kernels.kernelmanager import MappingKernelManager
62 from .services.kernels.kernelmanager import MappingKernelManager
63 from .services.config import ConfigManager
63 from .services.contents.manager import ContentsManager
64 from .services.contents.manager import ContentsManager
64 from .services.contents.filemanager import FileContentsManager
65 from .services.contents.filemanager import FileContentsManager
65 from .services.clusters.clustermanager import ClusterManager
66 from .services.clusters.clustermanager import ClusterManager
@@ -82,7 +83,7 b' from IPython.utils import submodule'
82 from IPython.utils.process import check_pid
83 from IPython.utils.process import check_pid
83 from IPython.utils.traitlets import (
84 from IPython.utils.traitlets import (
84 Dict, Unicode, Integer, List, Bool, Bytes, Instance,
85 Dict, Unicode, Integer, List, Bool, Bytes, Instance,
85 DottedObjectName, TraitError,
86 DottedObjectName, TraitError, Type,
86 )
87 )
87 from IPython.utils import py3compat
88 from IPython.utils import py3compat
88 from IPython.utils.path import filefind, get_ipython_dir
89 from IPython.utils.path import filefind, get_ipython_dir
@@ -614,24 +615,30 b' class NotebookApp(BaseIPythonApplication):'
614 else:
615 else:
615 self.log.info("Using MathJax: %s", new)
616 self.log.info("Using MathJax: %s", new)
616
617
617 contents_manager_class = DottedObjectName('IPython.html.services.contents.filemanager.FileContentsManager',
618 contents_manager_class = Type(
619 default_value=FileContentsManager,
620 klass=ContentsManager,
618 config=True,
621 config=True,
619 help='The notebook manager class to use.'
622 help='The notebook manager class to use.'
620 )
623 )
621 kernel_manager_class = DottedObjectName('IPython.html.services.kernels.kernelmanager.MappingKernelManager',
624 kernel_manager_class = Type(
625 default_value=MappingKernelManager,
622 config=True,
626 config=True,
623 help='The kernel manager class to use.'
627 help='The kernel manager class to use.'
624 )
628 )
625 session_manager_class = DottedObjectName('IPython.html.services.sessions.sessionmanager.SessionManager',
629 session_manager_class = Type(
630 default_value=SessionManager,
626 config=True,
631 config=True,
627 help='The session manager class to use.'
632 help='The session manager class to use.'
628 )
633 )
629 cluster_manager_class = DottedObjectName('IPython.html.services.clusters.clustermanager.ClusterManager',
634 cluster_manager_class = Type(
635 default_value=ClusterManager,
630 config=True,
636 config=True,
631 help='The cluster manager class to use.'
637 help='The cluster manager class to use.'
632 )
638 )
633
639
634 config_manager_class = DottedObjectName('IPython.html.services.config.manager.ConfigManager',
640 config_manager_class = Type(
641 default_value=ConfigManager,
635 config = True,
642 config = True,
636 help='The config manager class to use'
643 help='The config manager class to use'
637 )
644 )
@@ -641,15 +648,17 b' class NotebookApp(BaseIPythonApplication):'
641 def _kernel_spec_manager_default(self):
648 def _kernel_spec_manager_default(self):
642 return KernelSpecManager(ipython_dir=self.ipython_dir)
649 return KernelSpecManager(ipython_dir=self.ipython_dir)
643
650
644 kernel_spec_manager_class = DottedObjectName('IPython.kernel.kernelspec.KernelSpecManager',
651 kernel_spec_manager_class = Type(
645 config=True,
652 default_value=KernelSpecManager,
646 help="""
653 config=True,
647 The kernel spec manager class to use. Should be a subclass
654 help="""
648 of `IPython.kernel.kernelspec.KernelSpecManager`.
655 The kernel spec manager class to use. Should be a subclass
656 of `IPython.kernel.kernelspec.KernelSpecManager`.
649
657
650 The Api of KernelSpecManager is provisional and might change
658 The Api of KernelSpecManager is provisional and might change
651 without warning between this version of IPython and the next stable one.
659 without warning between this version of IPython and the next stable one.
652 """)
660 """
661 )
653
662
654 login_handler = DottedObjectName('IPython.html.auth.login.LoginHandler',
663 login_handler = DottedObjectName('IPython.html.auth.login.LoginHandler',
655 config=True,
664 config=True,
@@ -744,29 +753,38 b' class NotebookApp(BaseIPythonApplication):'
744 def init_configurables(self):
753 def init_configurables(self):
745 # force Session default to be secure
754 # force Session default to be secure
746 default_secure(self.config)
755 default_secure(self.config)
747 kls = import_item(self.kernel_spec_manager_class)
748 self.kernel_spec_manager = kls(ipython_dir=self.ipython_dir)
749
756
750 kls = import_item(self.kernel_manager_class)
757 self.kernel_spec_manager = self.kernel_spec_manager_class(
751 self.kernel_manager = kls(
758 ipython_dir=self.ipython_dir,
752 parent=self, log=self.log, ipython_kernel_argv=self.ipython_kernel_argv,
759 )
753 connection_dir = self.profile_dir.security_dir,
760 self.kernel_manager = self.kernel_manager_class(
761 parent=self,
762 log=self.log,
763 ipython_kernel_argv=self.ipython_kernel_argv,
764 connection_dir=self.profile_dir.security_dir,
765 )
766 self.contents_manager = self.contents_manager_class(
767 parent=self,
768 log=self.log,
769 )
770 self.session_manager = self.session_manager_class(
771 parent=self,
772 log=self.log,
773 kernel_manager=self.kernel_manager,
774 contents_manager=self.contents_manager,
775 )
776 self.cluster_manager = self.cluster_manager_class(
777 parent=self,
778 log=self.log,
754 )
779 )
755 kls = import_item(self.contents_manager_class)
756 self.contents_manager = kls(parent=self, log=self.log)
757 kls = import_item(self.session_manager_class)
758 self.session_manager = kls(parent=self, log=self.log,
759 kernel_manager=self.kernel_manager,
760 contents_manager=self.contents_manager)
761 kls = import_item(self.cluster_manager_class)
762 self.cluster_manager = kls(parent=self, log=self.log)
763 self.cluster_manager.update_profiles()
764 self.login_handler_class = import_item(self.login_handler)
780 self.login_handler_class = import_item(self.login_handler)
765 self.logout_handler_class = import_item(self.logout_handler)
781 self.logout_handler_class = import_item(self.logout_handler)
766
782
767 kls = import_item(self.config_manager_class)
783 self.config_manager = self.config_manager_class(
768 self.config_manager = kls(parent=self, log=self.log,
784 parent=self,
769 profile_dir=self.profile_dir.location)
785 log=self.log,
786 profile_dir=self.profile_dir.location,
787 )
770
788
771 def init_logging(self):
789 def init_logging(self):
772 # This prevents double log messages because tornado use a root logger that
790 # This prevents double log messages because tornado use a root logger that
General Comments 0
You need to be logged in to leave comments. Login now