From b398d005ad2cbc033b0ec3234ba2c94e1259ea68 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Thu, 29 Sep 2016 10:34:45 +0200
Subject: [PATCH] Add base aliases for nbextensions apps

Includes `--log-level` alias that was missing from install/enable applications
---
 notebook/extensions.py       | 4 ++++
 notebook/nbextensions.py     | 8 +++++---
 notebook/serverextensions.py | 1 -
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/notebook/extensions.py b/notebook/extensions.py
index 1b5fe40bd..f906c1e4c 100644
--- a/notebook/extensions.py
+++ b/notebook/extensions.py
@@ -45,11 +45,15 @@ _base_flags.update({
 })
 _base_flags['python'] = _base_flags['py']
 
+_base_aliases = {}
+_base_aliases.update(JupyterApp.aliases)
+
 
 class BaseExtensionApp(JupyterApp):
     """Base nbextension installer app"""
     _log_formatter_cls = LogFormatter
     flags = _base_flags
+    aliases = _base_aliases
     version = __version__
 
     user = Bool(False, config=True, help="Whether to do a user install")
diff --git a/notebook/nbextensions.py b/notebook/nbextensions.py
index 1c0034f10..7624422fb 100644
--- a/notebook/nbextensions.py
+++ b/notebook/nbextensions.py
@@ -571,7 +571,7 @@ def validate_nbextension_python(spec, full_dest, logger=None):
 
 from .extensions import (
     BaseExtensionApp, _get_config_dir, GREEN_ENABLED, RED_DISABLED, GREEN_OK, RED_X,
-    ArgumentConflict, _base_flags
+    ArgumentConflict, _base_aliases, _base_flags,
 )
 from traitlets import Bool, Unicode
 
@@ -592,11 +592,13 @@ flags.update({
 
 flags['s'] = flags['symlink']
 
-aliases = {
+aliases = {}
+aliases.update(_base_aliases)
+aliases.update({
     "prefix" : "InstallNBExtensionApp.prefix",
     "nbextensions" : "InstallNBExtensionApp.nbextensions_dir",
     "destination" : "InstallNBExtensionApp.destination",
-}
+})
 
 class InstallNBExtensionApp(BaseExtensionApp):
     """Entry point for installing notebook extensions"""
diff --git a/notebook/serverextensions.py b/notebook/serverextensions.py
index 4196cdf05..9889c702b 100644
--- a/notebook/serverextensions.py
+++ b/notebook/serverextensions.py
@@ -162,7 +162,6 @@ class ToggleServerExtensionApp(BaseExtensionApp):
     name = "jupyter serverextension enable/disable"
     description = "Enable/disable a server extension using frontend configuration files."
     
-    aliases = {}
     flags = flags
 
     user = Bool(True, config=True, help="Whether to do a user install")