From 46d1eb9baa268754c628ec15da6d7e2128996be6 2014-04-30 00:44:15 From: Thomas Kluyver Date: 2014-04-30 00:44:15 Subject: [PATCH] Format command name into subcommand_description at run time, not import This caused an issue if IPython was imported after sys.argv was set to []. --- diff --git a/IPython/config/application.py b/IPython/config/application.py index 2b60936..ed13a37 100644 --- a/IPython/config/application.py +++ b/IPython/config/application.py @@ -54,7 +54,7 @@ if not hasattr(sys, "argv"): subcommand_description = """ Subcommands are launched as `{app} cmd [args]`. For information on using subcommand 'cmd', do: `{app} cmd -h`. -""".strip().format(app=os.path.basename(sys.argv[0])) +""" # get running program name #----------------------------------------------------------------------------- @@ -310,7 +310,8 @@ class Application(SingletonConfigurable): lines = ["Subcommands"] lines.append('-'*len(lines[0])) lines.append('') - for p in wrap_paragraphs(self.subcommand_description): + for p in wrap_paragraphs(self.subcommand_description.format( + app=os.path.basename(self.argv[0]))): lines.append(p) lines.append('') for subc, (cls, help) in iteritems(self.subcommands):