Use the main notebook config file

jupyterlab/labapp.py

@@ -18,7 +18,7 @@ from .labextensions import (
     find_labextension, validate_labextension_folder,
     get_labextension_manifest_data_by_name,
     get_labextension_manifest_data_by_folder,
-    get_labextension_config_python, LabConfig
+    get_labextension_config_python, CONFIG_SECTION
 )
 
 #-----------------------------------------------------------------------------
@@ -141,15 +141,12 @@ def load_jupyter_server_extension(nbapp):
         nbapp.log.info(DEV_NOTE_NPM)
 
     # Get the appropriate lab config.
-    config_app = LabConfig()
-    config_app.config_dir = nbapp.config_dir
-    config_app.load_config_file()
-
+    lab_config = nbapp.config.get(CONFIG_SECTION, {})
     web_app = nbapp.web_app
 
     # Add the lab extensions to the web app.
     out = dict()
-    for (name, ext_config) in config_app.labextensions.items():
+    for (name, ext_config) in lab_config.labextensions.items():
         if not ext_config['enabled']:
             continue
         folder = find_labextension(name)

jupyterlab/labextensions.py

@@ -22,7 +22,6 @@ from ipython_genutils.path import ensure_dir_exists
 from ipython_genutils.py3compat import string_types, cast_unicode_py2
 from ._version import __version__
 
-from traitlets import Dict
 from traitlets.config.manager import BaseJSONConfigManager
 from traitlets.utils.importstring import import_item
 
@@ -40,8 +39,8 @@ GREEN_ENABLED = '\033[32menabled \033[0m' if os.name != 'nt' else 'enabled '
 RED_DISABLED = '\033[31mdisabled\033[0m' if os.name != 'nt' else 'disabled'
 
 
-CONFIG_NAME = 'jupyterlab_config'
-APP_NAME = 'LabConfig'
+CONFIG_NAME = 'jupyter_notebook_config'
+CONFIG_SECTION = 'LabConfig'
 
 #------------------------------------------------------------------------------
 # Public API
@@ -291,7 +290,7 @@ def _set_labextension_state(name, state,
             name
         ))
     labextensions = (
-        cfg.setdefault(APP_NAME, {})
+        cfg.setdefault(CONFIG_SECTION, {})
         .setdefault("labextensions", {})
     )
 
@@ -656,18 +655,6 @@ aliases = {
 }
 
 
-class LabConfig(JupyterApp):
-    name = 'jupyterlab'
-
-    labextensions = Dict({}, config=True,
-        help=('Dict of Python modules to load as lab extensions.'
-            'Each entry consists of a required `enabled` key used'
-            'to enable or disable the extension, and an optional'
-            '`python_module` key for the associated python module.'
-            'Extensions are loaded in alphabetical order')
-    )
-
-
 class InstallLabExtensionApp(BaseLabExtensionApp):
     """Entry point for installing JupyterLab extensions"""
     description = """Install JupyterLab extensions
@@ -912,7 +899,7 @@ class ListLabExtensionsApp(BaseLabExtensionApp):
             cm = BaseJSONConfigManager(parent=self, config_dir=config_dir)
             data = cm.get(CONFIG_NAME)
             labextensions = (
-                data.setdefault(APP_NAME, {})
+                data.setdefault(CONFIG_SECTION, {})
                 .setdefault("labextensions", {})
             )
             if labextensions:

jupyterlab/tests/test_labextensions.py

@@ -30,7 +30,7 @@ from jupyterlab.labextensions import (install_labextension, check_labextension,
     get_labextension_config_python,
     get_labextension_manifest_data_by_name,
     get_labextension_manifest_data_by_folder,
-    _read_config_data, APP_NAME
+    _read_config_data, CONFIG_SECTION
 )
 
 
@@ -230,7 +230,7 @@ class TestInstallLabExtension(TestCase):
             enable_labextension(self.name)
 
         data = _read_config_data(user=True)
-        config = data.get(APP_NAME, {}).get('labextensions', {}).get(self.name, {})
+        config = data.get(CONFIG_SECTION, {}).get('labextensions', {}).get(self.name, {})
         assert config['enabled'] == True
         assert 'python_module' not in config
 
@@ -239,7 +239,7 @@ class TestInstallLabExtension(TestCase):
         disable_labextension(self.name)
 
         data = _read_config_data(user=True)
-        config = data.get(APP_NAME, {}).get('labextensions', {}).get(self.name, {})
+        config = data.get(CONFIG_SECTION, {}).get('labextensions', {}).get(self.name, {})
         assert not config['enabled']
         assert 'python_module' not in config
 
@@ -296,7 +296,7 @@ class TestInstallLabExtension(TestCase):
         enable_labextension_python('mockextension')
         
         data = _read_config_data(user=True)
-        config = data.get(APP_NAME, {}).get('labextensions', {}).get('mockextension', False)
+        config = data.get(CONFIG_SECTION, {}).get('labextensions', {}).get('mockextension', False)
         assert config['enabled'] == True
         assert config['python_module'] == 'mockextension'
         
@@ -307,7 +307,7 @@ class TestInstallLabExtension(TestCase):
         disable_labextension_python('mockextension', user=True)
         
         data = _read_config_data(user=True)
-        config = data.get(APP_NAME, {}).get('labextensions', {}).get('mockextension', {})
+        config = data.get(CONFIG_SECTION, {}).get('labextensions', {}).get('mockextension', {})
         assert not config['enabled']
 
     def test_labextensionpy_validate(self):