summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcmd2.py2
-rw-r--r--tests/conftest.py19
2 files changed, 11 insertions, 10 deletions
diff --git a/cmd2.py b/cmd2.py
index c8682dc5..91e90def 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -1679,7 +1679,7 @@ arg is /regex/ matching regular expression regex"""
@with_argument_parser(argparser)
def do_history(self, arglist, args):
# If an argument was supplied, then retrieve partial contents of the history
- if arglist:
+ if args.arg:
# If a character indicating a slice is present, retrieve a slice of the history
arg = args.arg[0]
if '..' in arg or ':' in arg:
diff --git a/tests/conftest.py b/tests/conftest.py
index 97116b48..21899f36 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -20,19 +20,20 @@ cmdenvironment help load pyscript run set shortcuts
"""
# Help text for the history command
-HELP_HISTORY = """history [arg]: lists past commands issued
+HELP_HISTORY = """usage: history [-h] [-s] [arg [arg ...]]
- | no arg: list all
- | arg is integer: list one history item, by index
- | a..b, a:b, a:, ..b -> list history items by a span of indices (inclusive)
- | arg is string: list all commands matching string search
- | arg is /enclosed in forward-slashes/: regular expression search
+list past commands issued
-Usage: history [options] (limit on which commands to include)
+positional arguments:
+ arg no arg list all
+ arg is integer by index
+ a..b, a:b, a:, ..b by indices (inclusive)
+ arg is string containing string
+ arg is /regex/ matching regular expression regex
-Options:
+optional arguments:
-h, --help show this help message and exit
- -s, --script Script format; no separation lines
+ -s, --script script format; no separation lines
"""
# Output from the shortcuts command with default built-in shortcuts