Show More
@@ -23,7 +23,7 b' from azure.storage import BlobService' | |||||
23 |
|
23 | |||
24 | from tornado import web |
|
24 | from tornado import web | |
25 |
|
25 | |||
26 |
from . |
|
26 | from .nbmanager import NotebookManager | |
27 | from IPython.nbformat import current |
|
27 | from IPython.nbformat import current | |
28 | from IPython.utils.traitlets import Unicode, Instance |
|
28 | from IPython.utils.traitlets import Unicode, Instance | |
29 |
|
29 | |||
@@ -32,7 +32,7 b' from IPython.utils.traitlets import Unicode, Instance' | |||||
32 | # Classes |
|
32 | # Classes | |
33 | #----------------------------------------------------------------------------- |
|
33 | #----------------------------------------------------------------------------- | |
34 |
|
34 | |||
35 |
class AzureNotebookManager( |
|
35 | class AzureNotebookManager(NotebookManager): | |
36 |
|
36 | |||
37 | account_name = Unicode('', config=True, help='Azure storage account name.') |
|
37 | account_name = Unicode('', config=True, help='Azure storage account name.') | |
38 | account_key = Unicode('', config=True, help='Azure storage account key.') |
|
38 | account_key = Unicode('', config=True, help='Azure storage account key.') |
@@ -23,7 +23,7 b' import glob' | |||||
23 |
|
23 | |||
24 | from tornado import web |
|
24 | from tornado import web | |
25 |
|
25 | |||
26 |
from . |
|
26 | from .nbmanager import NotebookManager | |
27 | from IPython.nbformat import current |
|
27 | from IPython.nbformat import current | |
28 | from IPython.utils.traitlets import Unicode, Dict, Bool, TraitError |
|
28 | from IPython.utils.traitlets import Unicode, Dict, Bool, TraitError | |
29 |
|
29 | |||
@@ -31,7 +31,7 b' from IPython.utils.traitlets import Unicode, Dict, Bool, TraitError' | |||||
31 | # Classes |
|
31 | # Classes | |
32 | #----------------------------------------------------------------------------- |
|
32 | #----------------------------------------------------------------------------- | |
33 |
|
33 | |||
34 |
class FileNotebookManager( |
|
34 | class FileNotebookManager(NotebookManager): | |
35 |
|
35 | |||
36 | save_script = Bool(False, config=True, |
|
36 | save_script = Bool(False, config=True, | |
37 | help="""Automatically create a Python script when saving the notebook. |
|
37 | help="""Automatically create a Python script when saving the notebook. |
@@ -29,7 +29,7 b' from IPython.utils.traitlets import List, Dict, Unicode, TraitError' | |||||
29 | # Classes |
|
29 | # Classes | |
30 | #----------------------------------------------------------------------------- |
|
30 | #----------------------------------------------------------------------------- | |
31 |
|
31 | |||
32 |
class |
|
32 | class NotebookManager(LoggingConfigurable): | |
33 |
|
33 | |||
34 | # Todo: |
|
34 | # Todo: | |
35 | # The notebook_dir attribute is used to mean a couple of different things: |
|
35 | # The notebook_dir attribute is used to mean a couple of different things: |
@@ -51,7 +51,7 b' from .handlers import (LoginHandler, LogoutHandler,' | |||||
51 | MainClusterHandler, ClusterProfileHandler, ClusterActionHandler, |
|
51 | MainClusterHandler, ClusterProfileHandler, ClusterActionHandler, | |
52 | FileFindHandler, |
|
52 | FileFindHandler, | |
53 | ) |
|
53 | ) | |
54 |
from . |
|
54 | from .nbmanager import NotebookManager | |
55 | from .filenbmanager import FileNotebookManager |
|
55 | from .filenbmanager import FileNotebookManager | |
56 | from .clustermanager import ClusterManager |
|
56 | from .clustermanager import ClusterManager | |
57 |
|
57 | |||
@@ -237,7 +237,7 b' aliases.update({' | |||||
237 | 'port-retries': 'NotebookApp.port_retries', |
|
237 | 'port-retries': 'NotebookApp.port_retries', | |
238 | 'keyfile': 'NotebookApp.keyfile', |
|
238 | 'keyfile': 'NotebookApp.keyfile', | |
239 | 'certfile': 'NotebookApp.certfile', |
|
239 | 'certfile': 'NotebookApp.certfile', | |
240 |
'notebook-dir': ' |
|
240 | 'notebook-dir': 'NotebookManager.notebook_dir', | |
241 | 'browser': 'NotebookApp.browser', |
|
241 | 'browser': 'NotebookApp.browser', | |
242 | }) |
|
242 | }) | |
243 |
|
243 | |||
@@ -265,7 +265,7 b' class NotebookApp(BaseIPythonApplication):' | |||||
265 | """ |
|
265 | """ | |
266 | examples = _examples |
|
266 | examples = _examples | |
267 |
|
267 | |||
268 |
classes = IPythonConsoleApp.classes + [MappingKernelManager, |
|
268 | classes = IPythonConsoleApp.classes + [MappingKernelManager, NotebookManager, | |
269 | FileNotebookManager] |
|
269 | FileNotebookManager] | |
270 | flags = Dict(flags) |
|
270 | flags = Dict(flags) | |
271 | aliases = Dict(aliases) |
|
271 | aliases = Dict(aliases) | |
@@ -431,7 +431,7 b' class NotebookApp(BaseIPythonApplication):' | |||||
431 | else: |
|
431 | else: | |
432 | self.file_to_run = f |
|
432 | self.file_to_run = f | |
433 | nbdir = os.path.dirname(f) |
|
433 | nbdir = os.path.dirname(f) | |
434 |
self.config. |
|
434 | self.config.NotebookManager.notebook_dir = nbdir | |
435 |
|
435 | |||
436 | def init_configurables(self): |
|
436 | def init_configurables(self): | |
437 | # 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