##// END OF EJS Templates
Merge pull request #6969 from Carreau/ksmc...
Min RK -
r19077:a00d914e merge
parent child Browse files
Show More
@@ -611,11 +611,22 b' class NotebookApp(BaseIPythonApplication):'
611 611 def _kernel_spec_manager_default(self):
612 612 return KernelSpecManager(ipython_dir=self.ipython_dir)
613 613
614
615 kernel_spec_manager_class = DottedObjectName('IPython.kernel.kernelspec.KernelSpecManager',
616 config=True,
617 help="""
618 The kernel spec manager class to use. Should be a subclass
619 of `IPython.kernel.kernelspec.KernelSpecManager`.
620
621 The Api of KernelSpecManager is provisional and might change
622 without warning between this version of IPython and the next stable one.
623 """)
624
614 625 trust_xheaders = Bool(False, config=True,
615 626 help=("Whether to trust or not X-Scheme/X-Forwarded-Proto and X-Real-Ip/X-Forwarded-For headers"
616 627 "sent by the upstream reverse proxy. Necessary if the proxy handles SSL")
617 628 )
618
629
619 630 info_file = Unicode()
620 631
621 632 def _info_file_default(self):
@@ -692,6 +703,9 b' class NotebookApp(BaseIPythonApplication):'
692 703 def init_configurables(self):
693 704 # force Session default to be secure
694 705 default_secure(self.config)
706 kls = import_item(self.kernel_spec_manager_class)
707 self.kernel_spec_manager = kls(ipython_dir=self.ipython_dir)
708
695 709 kls = import_item(self.kernel_manager_class)
696 710 self.kernel_manager = kls(
697 711 parent=self, log=self.log, ipython_kernel_argv=self.ipython_kernel_argv,
General Comments 0
You need to be logged in to leave comments. Login now