Skip to content

Commit 994ae83

Browse files
committed
Renamed some parser arguments to make it more obvious they can accept more than 1 value
1 parent e273492 commit 994ae83

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

cmd2/cmd2.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,10 +2223,10 @@ def _alias_delete(self, args: argparse.Namespace) -> None:
22232223
if args.all:
22242224
self.aliases.clear()
22252225
self.poutput("All aliases deleted")
2226-
elif not args.name:
2226+
elif not args.names:
22272227
self.perror("Either --all or alias name(s) must be specified")
22282228
else:
2229-
for cur_name in utils.remove_duplicates(args.name):
2229+
for cur_name in utils.remove_duplicates(args.names):
22302230
if cur_name in self.aliases:
22312231
del self.aliases[cur_name]
22322232
self.poutput("Alias '{}' deleted".format(cur_name))
@@ -2235,8 +2235,8 @@ def _alias_delete(self, args: argparse.Namespace) -> None:
22352235

22362236
def _alias_list(self, args: argparse.Namespace) -> None:
22372237
"""List some or all aliases"""
2238-
if args.name:
2239-
for cur_name in utils.remove_duplicates(args.name):
2238+
if args.names:
2239+
for cur_name in utils.remove_duplicates(args.names):
22402240
if cur_name in self.aliases:
22412241
self.poutput("alias create {} {}".format(cur_name, self.aliases[cur_name]))
22422242
else:
@@ -2288,7 +2288,7 @@ def _alias_list(self, args: argparse.Namespace) -> None:
22882288
alias_delete_description = "Delete specified aliases or all aliases if --all is used"
22892289
alias_delete_parser = alias_subparsers.add_parser('delete', help=alias_delete_help,
22902290
description=alias_delete_description)
2291-
alias_delete_parser.add_argument('name', nargs=argparse.ZERO_OR_MORE, help='alias to delete',
2291+
alias_delete_parser.add_argument('names', nargs=argparse.ZERO_OR_MORE, help='alias(es) to delete',
22922292
choices_method=_get_alias_completion_items, descriptive_header='Value')
22932293
alias_delete_parser.add_argument('-a', '--all', action='store_true', help="delete all aliases")
22942294
alias_delete_parser.set_defaults(func=_alias_delete)
@@ -2302,7 +2302,7 @@ def _alias_list(self, args: argparse.Namespace) -> None:
23022302

23032303
alias_list_parser = alias_subparsers.add_parser('list', help=alias_list_help,
23042304
description=alias_list_description)
2305-
alias_list_parser.add_argument('name', nargs=argparse.ZERO_OR_MORE, help='alias to list',
2305+
alias_list_parser.add_argument('names', nargs=argparse.ZERO_OR_MORE, help='alias(es) to list',
23062306
choices_method=_get_alias_completion_items, descriptive_header='Value')
23072307
alias_list_parser.set_defaults(func=_alias_list)
23082308

@@ -2400,10 +2400,10 @@ def _macro_delete(self, args: argparse.Namespace) -> None:
24002400
if args.all:
24012401
self.macros.clear()
24022402
self.poutput("All macros deleted")
2403-
elif not args.name:
2403+
elif not args.names:
24042404
self.perror("Either --all or macro name(s) must be specified")
24052405
else:
2406-
for cur_name in utils.remove_duplicates(args.name):
2406+
for cur_name in utils.remove_duplicates(args.names):
24072407
if cur_name in self.macros:
24082408
del self.macros[cur_name]
24092409
self.poutput("Macro '{}' deleted".format(cur_name))
@@ -2412,8 +2412,8 @@ def _macro_delete(self, args: argparse.Namespace) -> None:
24122412

24132413
def _macro_list(self, args: argparse.Namespace) -> None:
24142414
"""List some or all macros"""
2415-
if args.name:
2416-
for cur_name in utils.remove_duplicates(args.name):
2415+
if args.names:
2416+
for cur_name in utils.remove_duplicates(args.names):
24172417
if cur_name in self.macros:
24182418
self.poutput("macro create {} {}".format(cur_name, self.macros[cur_name].value))
24192419
else:
@@ -2488,7 +2488,7 @@ def _macro_list(self, args: argparse.Namespace) -> None:
24882488
macro_delete_description = "Delete specified macros or all macros if --all is used"
24892489
macro_delete_parser = macro_subparsers.add_parser('delete', help=macro_delete_help,
24902490
description=macro_delete_description)
2491-
macro_delete_parser.add_argument('name', nargs=argparse.ZERO_OR_MORE, help='macro to delete',
2491+
macro_delete_parser.add_argument('names', nargs=argparse.ZERO_OR_MORE, help='macro(s) to delete',
24922492
choices_method=_get_macro_completion_items, descriptive_header='Value')
24932493
macro_delete_parser.add_argument('-a', '--all', action='store_true', help="delete all macros")
24942494
macro_delete_parser.set_defaults(func=_macro_delete)
@@ -2501,7 +2501,7 @@ def _macro_list(self, args: argparse.Namespace) -> None:
25012501
"Without arguments, all macros will be listed.")
25022502

25032503
macro_list_parser = macro_subparsers.add_parser('list', help=macro_list_help, description=macro_list_description)
2504-
macro_list_parser.add_argument('name', nargs=argparse.ZERO_OR_MORE, help='macro to list',
2504+
macro_list_parser.add_argument('names', nargs=argparse.ZERO_OR_MORE, help='macro(s) to list',
25052505
choices_method=_get_macro_completion_items, descriptive_header='Value')
25062506
macro_list_parser.set_defaults(func=_macro_list)
25072507

0 commit comments

Comments
 (0)