diff options
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | cmd2/cmd2.py | 9 | ||||
| -rw-r--r-- | tests/test_cmd2.py | 15 |
3 files changed, 26 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e22ee79..764d0061 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -## 0.9.3 (TBD, 2018) +## 0.9.3 (July TBD, 2018) +* Bug Fixes + * Fixed bug when StatementParser ``__init__()`` was called with ``terminators`` equal to ``None`` + * Fixed bug when ``Cmd.onecmd()`` was called with a raw ``str`` ## 0.9.2 (June 28, 2018) * Bug Fixes diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py index bdb8452a..c6914b95 100644 --- a/cmd2/cmd2.py +++ b/cmd2/cmd2.py @@ -1920,14 +1920,19 @@ class Cmd(cmd.Cmd): result = target return result - def onecmd(self, statement: Statement) -> Optional[bool]: + def onecmd(self, statement: Union[Statement, str]) -> Optional[bool]: """ This executes the actual do_* method for a command. If the command provided doesn't exist, then it executes _default() instead. - :param statement: Command - a parsed command from the input stream + :param statement: Command - intended to be a Statement instance parsed command from the input stream, + alternative acceptance of a str is present only for backward compatibility with cmd :return: a flag indicating whether the interpretation of commands should stop """ + # For backwards compatibility with cmd, allow a str to be passed in + if not isinstance(statement, Statement): + statement = self._complete_statement(statement) + funcname = self._func_named(statement.command) if not funcname: self.default(statement) diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index 7b0b93a6..95970436 100644 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -1785,3 +1785,18 @@ def test_readline_remove_history_item(base_app): assert readline.get_current_history_length() == 1 readline.remove_history_item(0) assert readline.get_current_history_length() == 0 + +def test_onecmd_raw_str_continue(base_app): + line = "help" + stop = base_app.onecmd(line) + out = base_app.stdout.buffer + assert not stop + assert out.strip() == BASE_HELP.strip() + +def test_onecmd_raw_str_quit(base_app): + line = "quit" + stop = base_app.onecmd(line) + out = base_app.stdout.buffer + assert stop + assert out == '' + |