From 5aaf309cb8ac221febd7568fd1afe4201602c5b2 2014-03-10 23:16:58 From: Brian E. Granger Date: 2014-03-10 23:16:58 Subject: [PATCH] Merge pull request #5325 from minrk/notary-config add NotebookNotary to NotebookApp's class list --- diff --git a/IPython/html/notebookapp.py b/IPython/html/notebookapp.py index 4bd1037..3cd81f5 100644 --- a/IPython/html/notebookapp.py +++ b/IPython/html/notebookapp.py @@ -83,6 +83,7 @@ from IPython.kernel.zmq.kernelapp import ( kernel_flags, kernel_aliases, ) +from IPython.nbformat.sign import NotebookNotary from IPython.utils.importstring import import_item from IPython.utils.localinterfaces import localhost from IPython.utils import submodule @@ -311,7 +312,7 @@ class NotebookApp(BaseIPythonApplication): examples = _examples classes = IPythonConsoleApp.classes + [MappingKernelManager, NotebookManager, - FileNotebookManager] + FileNotebookManager, NotebookNotary] flags = Dict(flags) aliases = Dict(aliases) diff --git a/IPython/nbformat/sign.py b/IPython/nbformat/sign.py index 33f5432..ba16c9a 100644 --- a/IPython/nbformat/sign.py +++ b/IPython/nbformat/sign.py @@ -97,7 +97,9 @@ class NotebookNotary(LoggingConfigurable): def _digestmod_default(self): return getattr(hashlib, self.algorithm) - secret_file = Unicode() + secret_file = Unicode(config=True, + help="""The file where the secret key is stored.""" + ) def _secret_file_default(self): if self.profile_dir is None: return ''