##// END OF EJS Templates
Fixing minor bugs in notebookapp related to base class name.
Brian Granger -
Show More
@@ -51,7 +51,8 b' from .handlers import (LoginHandler, LogoutHandler,'
51 MainClusterHandler, ClusterProfileHandler, ClusterActionHandler,
51 MainClusterHandler, ClusterProfileHandler, ClusterActionHandler,
52 FileFindHandler,
52 FileFindHandler,
53 )
53 )
54 from .notebookmanager import NotebookManager
54 from .basenbmanager import BaseNotebookManager
55 from .filenbmanager import FileNotebookManager
55 from .clustermanager import ClusterManager
56 from .clustermanager import ClusterManager
56
57
57 from IPython.config.application import catch_config_error, boolean_flag
58 from IPython.config.application import catch_config_error, boolean_flag
@@ -219,7 +220,7 b" flags['read-only'] = ("
219 )
220 )
220
221
221 # Add notebook manager flags
222 # Add notebook manager flags
222 flags.update(boolean_flag('script', 'NotebookManager.save_script',
223 flags.update(boolean_flag('script', 'FileNotebookManager.save_script',
223 'Auto-save a .py script everytime the .ipynb notebook is saved',
224 'Auto-save a .py script everytime the .ipynb notebook is saved',
224 'Do not auto-save .py scripts for every notebook'))
225 'Do not auto-save .py scripts for every notebook'))
225
226
@@ -236,7 +237,7 b' aliases.update({'
236 'port-retries': 'NotebookApp.port_retries',
237 'port-retries': 'NotebookApp.port_retries',
237 'keyfile': 'NotebookApp.keyfile',
238 'keyfile': 'NotebookApp.keyfile',
238 'certfile': 'NotebookApp.certfile',
239 'certfile': 'NotebookApp.certfile',
239 'notebook-dir': 'NotebookManager.notebook_dir',
240 'notebook-dir': 'BaseNotebookManager.notebook_dir',
240 'browser': 'NotebookApp.browser',
241 'browser': 'NotebookApp.browser',
241 })
242 })
242
243
@@ -264,7 +265,8 b' class NotebookApp(BaseIPythonApplication):'
264 """
265 """
265 examples = _examples
266 examples = _examples
266
267
267 classes = IPythonConsoleApp.classes + [MappingKernelManager, NotebookManager]
268 classes = IPythonConsoleApp.classes + [MappingKernelManager, BaseNotebookManager,
269 FileNotebookManager]
268 flags = Dict(flags)
270 flags = Dict(flags)
269 aliases = Dict(aliases)
271 aliases = Dict(aliases)
270
272
@@ -429,7 +431,7 b' class NotebookApp(BaseIPythonApplication):'
429 else:
431 else:
430 self.file_to_run = f
432 self.file_to_run = f
431 nbdir = os.path.dirname(f)
433 nbdir = os.path.dirname(f)
432 self.config.NotebookManager.notebook_dir = nbdir
434 self.config.BaseNotebookManager.notebook_dir = nbdir
433
435
434 def init_configurables(self):
436 def init_configurables(self):
435 # force Session default to be secure
437 # force Session default to be secure
General Comments 0
You need to be logged in to leave comments. Login now