##// END OF EJS Templates
Merge pull request #5325 from minrk/notary-config...
Brian E. Granger -
r15797:5aaf309c merge
parent child Browse files
Show More
@@ -83,6 +83,7 b' from IPython.kernel.zmq.kernelapp import ('
83 83 kernel_flags,
84 84 kernel_aliases,
85 85 )
86 from IPython.nbformat.sign import NotebookNotary
86 87 from IPython.utils.importstring import import_item
87 88 from IPython.utils.localinterfaces import localhost
88 89 from IPython.utils import submodule
@@ -311,7 +312,7 b' class NotebookApp(BaseIPythonApplication):'
311 312 examples = _examples
312 313
313 314 classes = IPythonConsoleApp.classes + [MappingKernelManager, NotebookManager,
314 FileNotebookManager]
315 FileNotebookManager, NotebookNotary]
315 316 flags = Dict(flags)
316 317 aliases = Dict(aliases)
317 318
@@ -97,7 +97,9 b' class NotebookNotary(LoggingConfigurable):'
97 97 def _digestmod_default(self):
98 98 return getattr(hashlib, self.algorithm)
99 99
100 secret_file = Unicode()
100 secret_file = Unicode(config=True,
101 help="""The file where the secret key is stored."""
102 )
101 103 def _secret_file_default(self):
102 104 if self.profile_dir is None:
103 105 return ''
General Comments 0
You need to be logged in to leave comments. Login now