Further cleanup AppOptions

jupyterlab/commands.py

@@ -290,10 +290,19 @@ def watch_dev(logger=None):
 
 
 class AppOptions(HasTraits):
+    def __init__(self, core_config=None, **kwargs):
+        if core_config is not None:
+            kwargs['core_config'] = core_config
+        super(AppOptions, self).__init__(**kwargs)
+
     app_dir = Unicode()
+
     use_sys_dir = Bool(True)
+
     logger = Instance(logging.Logger, allow_none=True)
+
     core_config = Instance(CoreConfig)
+
     kill_event = Instance(Event, args=())
 
     # These defaults need to be dynamic to pick up

jupyterlab/extension.py

@@ -159,7 +159,7 @@ def load_jupyter_server_extension(nbapp):
     logger.info('JupyterLab application directory is %s' % app_dir)
 
     build_url = ujoin(base_url, build_path)
-    builder = Builder(logger, core_mode, app_dir)
+    builder = Builder(None, core_mode, app_options=build_handler_options)
     build_handler = (build_url, BuildHandler, {'builder': builder})
     handlers = [build_handler]
 
@@ -198,7 +198,7 @@ def load_jupyter_server_extension(nbapp):
 
     if not core_mode and not errored:
         ext_url = ujoin(base_url, extensions_handler_path)
-        ext_manager = ExtensionManager(None, None, app_options=build_handler_options)
+        ext_manager = ExtensionManager(app_options=build_handler_options)
         ext_handler = (ext_url, ExtensionHandler, {'manager': ext_manager})
         handlers.append(ext_handler)
 

jupyterlab/handlers/extension_manager_handler.py

@@ -137,13 +137,13 @@ class ExtensionManager(object):
     def uninstall(self, extension):
         """Handle an uninstall request"""
         did_uninstall = uninstall_extension(
-            extension, app_options=AppOptions(self.app_options))
+            extension, app_options=self.app_options)
         raise gen.Return(dict(status='ok' if did_uninstall else 'error',))
 
     @gen.coroutine
     def enable(self, extension):
         """Handle an enable request"""
-        enable_extension(extension, app_options=AppOptions(self.app_options))
+        enable_extension(extension, app_options=self.app_options)
         raise gen.Return(dict(status='ok',))
 
     @gen.coroutine

jupyterlab/labapp.py

@@ -118,7 +118,9 @@ class LabCleanApp(JupyterApp):
     app_dir = Unicode('', config=True, help='The app directory to clean')
 
     def start(self):
-        clean(app_options=AppOptions(app_dir=self.app_dir, logger=self.log))
+        clean(app_options=AppOptions(
+            app_dir=self.app_dir, logger=self.log,
+            core_config=self.core_config))
 
 
 class LabPathApp(JupyterApp):