Merge branch 'master' into macro_refactor

Author: kmvanbrunt

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 0.9.13 (TBD, 2019)
 * Bug Fixes
+    * Fixed issue where the wrong terminator was being appended by `Statement.expanded_command_line()`
     * Fixed issue where aliases and macros could not contain terminator characters in their values
     * History now shows what was typed for macros and not the resolved value by default. This is consistent with
     the behavior of aliases. Use the `expanded` or `verbose` arguments to `history` to see the resolved value for

cmd2/parsing.py

@@ -201,9 +201,7 @@ def command_and_args(self) -> str:
     def post_command(self) -> str:
         """A string containing any ending terminator, suffix, and redirection chars"""
         rtn = ''
-        if self.multiline_command:
-            rtn += constants.MULTILINE_TERMINATOR
-        elif self.terminator:
+        if self.terminator:
             rtn += self.terminator
 
         if self.suffix:

tests/test_parsing.py

@@ -492,7 +492,6 @@ def test_parse_alias_on_multiline_command(parser):
     assert statement.args == statement
     assert statement == 'has > inside an unfinished command'
     assert statement.terminator == ''
-    assert statement.expanded_command_line == statement.multiline_command + ' ' + statement + MULTILINE_TERMINATOR
 
 @pytest.mark.parametrize('line,output', [
     ('helpalias > out.txt', '>'),