Merge pull request #233 from minrk/base-flags

inherit base aliases/flags from traitlets Application

jupyter_core/application.py

@@ -27,19 +27,29 @@
 
 # aliases and flags
 
-base_aliases = {
+base_aliases = {}
+if isinstance(Application.aliases, dict):
+    # traitlets 5
+    base_aliases.update(Application.aliases)
+_jupyter_aliases = {
     'log-level' : 'Application.log_level',
     'config' : 'JupyterApp.config_file',
 }
+base_aliases.update(_jupyter_aliases)
 
-base_flags = {
+base_flags = {}
+if isinstance(Application.flags, dict):
+    # traitlets 5
+    base_flags.update(Application.flags)
+_jupyter_flags = {
     'debug': ({'Application' : {'log_level' : logging.DEBUG}},
             "set log level to logging.DEBUG (maximize logging output)"),
     'generate-config': ({'JupyterApp': {'generate_config': True}},
         "generate default config file"),
     'y': ({'JupyterApp': {'answer_yes': True}},
         "Answer yes to any questions instead of prompting."),
 }
+base_flags.update(_jupyter_flags)
 
 class NoStart(Exception):
     """Exception to raise when an application shouldn't start"""