diff options
Diffstat (limited to 'cmd2/cmd2.py')
| -rw-r--r-- | cmd2/cmd2.py | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index cc4c4bbc..6859de5b 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -2058,15 +2058,14 @@ class Cmd(cmd.Cmd): :param statement: Statement object with parsed input """ - arg = statement.raw if self.default_to_shell: - result = os.system(arg) + result = os.system(statement.command_and_args) # If os.system() succeeded, then don't print warning about unknown command if not result: return # Print out a message stating this is an unknown command - self.poutput('*** Unknown syntax: {}\n'.format(arg)) + self.poutput('*** Unknown syntax: {}\n'.format(statement.command_and_args)) def pseudo_raw_input(self, prompt: str) -> str: """Began life as a copy of cmd's cmdloop; like raw_input but @@ -2208,10 +2207,9 @@ class Cmd(cmd.Cmd): # ----- Alias subcommand functions ----- def alias_create(self, args: argparse.Namespace): - """ Creates or overwrites an alias """ + """Create or overwrites an alias""" # Validate the alias name - args.name = utils.strip_quotes(args.name) valid, errmsg = self.statement_parser.is_valid_command(args.name) if not valid: self.perror("Invalid alias name: {}".format(errmsg), traceback_war=False) @@ -2234,17 +2232,14 @@ class Cmd(cmd.Cmd): self.poutput("Alias '{}' {}".format(args.name, result)) def alias_delete(self, args: argparse.Namespace): - """ Deletes aliases """ + """Delete aliases""" if args.all: self.aliases.clear() self.poutput("All aliases deleted") elif not args.name: self.do_help('alias delete') else: - # Get rid of duplicates and strip quotes since the argparse decorator for do_alias() preserves them - aliases_to_delete = [utils.strip_quotes(cur_name) for cur_name in utils.remove_duplicates(args.name)] - - for cur_name in aliases_to_delete: + for cur_name in utils.remove_duplicates(args.name): if cur_name in self.aliases: del self.aliases[cur_name] self.poutput("Alias '{}' deleted".format(cur_name)) @@ -2252,12 +2247,9 @@ class Cmd(cmd.Cmd): self.perror("Alias '{}' does not exist".format(cur_name), traceback_war=False) def alias_list(self, args: argparse.Namespace): - """ Lists some or all aliases """ + """List some or all aliases""" if args.name: - # Get rid of duplicates and strip quotes since the argparse decorator for do_alias() preserves them - names_to_view = [utils.strip_quotes(cur_name) for cur_name in utils.remove_duplicates(args.name)] - - for cur_name in names_to_view: + for cur_name in utils.remove_duplicates(args.name): if cur_name in self.aliases: self.poutput("alias create {} {}".format(cur_name, self.aliases[cur_name])) else: @@ -2343,10 +2335,9 @@ class Cmd(cmd.Cmd): # ----- Macro subcommand functions ----- def macro_create(self, args: argparse.Namespace): - """ Creates or overwrites a macro """ + """Create or overwrites a macro""" # Validate the macro name - args.name = utils.strip_quotes(args.name) valid, errmsg = self.statement_parser.is_valid_command(args.name) if not valid: self.perror("Invalid macro name: {}".format(errmsg), traceback_war=False) @@ -2419,17 +2410,14 @@ class Cmd(cmd.Cmd): self.poutput("Macro '{}' {}".format(args.name, result)) def macro_delete(self, args: argparse.Namespace): - """ Deletes macros """ + """Delete macros""" if args.all: self.macros.clear() self.poutput("All macros deleted") elif not args.name: self.do_help('macro delete') else: - # Get rid of duplicates and strip quotes since the argparse decorator for do_macro() preserves them - macros_to_delete = [utils.strip_quotes(cur_name) for cur_name in utils.remove_duplicates(args.name)] - - for cur_name in macros_to_delete: + for cur_name in utils.remove_duplicates(args.name): if cur_name in self.macros: del self.macros[cur_name] self.poutput("Macro '{}' deleted".format(cur_name)) @@ -2437,12 +2425,9 @@ class Cmd(cmd.Cmd): self.perror("Macro '{}' does not exist".format(cur_name), traceback_war=False) def macro_list(self, args: argparse.Namespace): - """ Lists some or all macros """ + """List some or all macros""" if args.name: - # Get rid of duplicates and strip quotes since the argparse decorator for do_macro() preserves them - names_to_view = [utils.strip_quotes(cur_name) for cur_name in utils.remove_duplicates(args.name)] - - for cur_name in names_to_view: + for cur_name in utils.remove_duplicates(args.name): if cur_name in self.macros: self.poutput("macro create {} {}".format(cur_name, self.macros[cur_name].value)) else: @@ -2949,7 +2934,16 @@ class Cmd(cmd.Cmd): sys.displayhook = sys.__displayhook__ sys.excepthook = sys.__excepthook__ - py_parser = ACArgumentParser() + py_description = ("Invoke Python command or shell\n" + "\n" + "Note that, when invoking a command directly from the command line, this shell\n" + "has limited ability to parse Python statements into tokens. In particular,\n" + "there may be problems with whitespace and quotes depending on their placement.\n" + "\n" + "If you see strange parsing behavior, it's best to just open the Python shell by\n" + "providing no arguments to py and run more complex statements there.") + + py_parser = ACArgumentParser(description=py_description) py_parser.add_argument('command', help="command to run", nargs='?') py_parser.add_argument('remainder', help="remainder of command", nargs=argparse.REMAINDER) @@ -3000,6 +2994,8 @@ class Cmd(cmd.Cmd): if args.remainder: full_command += ' ' + ' '.join(args.remainder) + # If running at the CLI, print the output of the command + bridge.cmd_echo = True interp.runcode(full_command) # If there are no args, then we will open an interactive Python console |