Merge pull request #214 from jasongrout/trait-instances

Use instances of traits instead of trait classes
pull/227/head
Min RK 11 years ago
commit b0cae1f51b

@ -586,7 +586,7 @@ class NotebookApp(JupyterApp):
self.log.warn("base_project_url is deprecated, use base_url")
self.base_url = new
extra_static_paths = List(Unicode, config=True,
extra_static_paths = List(Unicode(), config=True,
help="""Extra paths to search for serving static files.
This allows adding javascript/css to be available from the notebook server machine,
@ -598,7 +598,7 @@ class NotebookApp(JupyterApp):
"""return extra paths + the default location"""
return self.extra_static_paths + [DEFAULT_STATIC_FILES_PATH]
static_custom_path = List(Unicode,
static_custom_path = List(Unicode(),
help="""Path to search for custom.js, css"""
)
def _static_custom_path_default(self):
@ -610,7 +610,7 @@ class NotebookApp(JupyterApp):
DEFAULT_STATIC_FILES_PATH)
]
extra_template_paths = List(Unicode, config=True,
extra_template_paths = List(Unicode(), config=True,
help="""Extra paths to search for serving jinja templates.
Can be used to override templates from notebook.templates."""
@ -621,7 +621,7 @@ class NotebookApp(JupyterApp):
"""return extra paths + the default locations"""
return self.extra_template_paths + DEFAULT_TEMPLATE_PATH_LIST
extra_nbextensions_path = List(Unicode, config=True,
extra_nbextensions_path = List(Unicode(), config=True,
help="""extra paths to look for Javascript notebook extensions"""
)

@ -53,7 +53,7 @@ class ContentsManager(LoggingConfigurable):
def _notary_default(self):
return sign.NotebookNotary(parent=self)
hide_globs = List(Unicode, [
hide_globs = List(Unicode(), [
u'__pycache__', '*.pyc', '*.pyo',
'.DS_Store', '*.so', '*.dylib', '*~',
], config=True, help="""

@ -24,7 +24,7 @@ class MappingKernelManager(MultiKernelManager):
def _kernel_manager_class_default(self):
return "jupyter_client.ioloop.IOLoopKernelManager"
kernel_argv = List(Unicode)
kernel_argv = List(Unicode())
root_dir = Unicode(config=True)

Loading…
Cancel
Save