Fix history display issues

Issues were two fold:
- HistoryItem statement.raw was getting mangled for multiline commands due to macro-related changes in _input_line_to_statement()
- HistoryItem pretty printing wasn't using rstrip() anymore in verbose mode

I added a couple unit tests in the process of getting here.  But we should add some explicit unit tests of _input_line_to_statement() for cases like:
- basic single-line command
- macro single-line command
- multiline command

1 files changed, 2 insertions, 2 deletions

diff --git a/cmd2/history.py b/cmd2/history.py
index bbeb9199..7ec4ce7b 100644
--- a/cmd2/history.py
+++ b/cmd2/history.py
@@ -44,9 +44,9 @@ class HistoryItem():
         :return: pretty print string version of a HistoryItem
         """
         if verbose:
-            ret_str = self._listformat.format(self.idx, self.raw)
+            ret_str = self._listformat.format(self.idx, self.raw.rstrip())
             if self.raw != self.expanded.rstrip():
-                ret_str += self._ex_listformat.format(self.idx, self.expanded)
+                ret_str += self._ex_listformat.format(self.idx, self.expanded.rstrip())
         else:
             if script:
                 # display without entry numbers