Skip to content

Commit b82216c

Browse files
committed
Changed error messages
1 parent 86f5a28 commit b82216c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cmd2/cmd2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,7 +2396,7 @@ def _alias_delete(self, args: argparse.Namespace) -> None:
23962396
self.aliases.clear()
23972397
self.poutput("All aliases deleted")
23982398
elif not args.name:
2399-
self.do_help('alias delete')
2399+
self.perror("Either --all or alias name(s) must be specified")
24002400
else:
24012401
for cur_name in utils.remove_duplicates(args.name):
24022402
if cur_name in self.aliases:
@@ -2576,7 +2576,7 @@ def _macro_delete(self, args: argparse.Namespace) -> None:
25762576
self.macros.clear()
25772577
self.poutput("All macros deleted")
25782578
elif not args.name:
2579-
self.do_help('macro delete')
2579+
self.perror("Either --all or macro name(s) must be specified")
25802580
else:
25812581
for cur_name in utils.remove_duplicates(args.name):
25822582
if cur_name in self.macros:

tests/test_cmd2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@ def test_alias_delete_non_existing(base_app):
16171617

16181618
def test_alias_delete_no_name(base_app):
16191619
out, err = run_cmd(base_app, 'alias delete')
1620-
assert "Usage: alias delete" in out[0]
1620+
assert "Either --all or alias name(s)" in err[0]
16211621

16221622
def test_multiple_aliases(base_app):
16231623
alias1 = 'h1'
@@ -1768,7 +1768,7 @@ def test_macro_delete_non_existing(base_app):
17681768

17691769
def test_macro_delete_no_name(base_app):
17701770
out, err = run_cmd(base_app, 'macro delete')
1771-
assert "Usage: macro delete" in out[0]
1771+
assert "Either --all or macro name(s)" in err[0]
17721772

17731773
def test_multiple_macros(base_app):
17741774
macro1 = 'h1'

0 commit comments

Comments
 (0)