summaryrefslogtreecommitdiff
path: root/cmd2
diff options
context:
space:
mode:
authorTodd Leonhardt <todd.leonhardt@gmail.com>2019-12-10 17:06:20 -0500
committerGitHub <noreply@github.com>2019-12-10 17:06:20 -0500
commite13fc34e6f7d9e67422595411b62ff12b8bf769b (patch)
treeadef8bef9a988ea514a62ac72284b0996948a3a9 /cmd2
parent1cb8de929b8700263f84753c739c49065898c081 (diff)
parent42ee1cbabf13c1b2f54097bc24f920791ad260cf (diff)
downloadcmd2-git-e13fc34e6f7d9e67422595411b62ff12b8bf769b.tar.gz
Merge pull request #832 from python-cmd2/rstrip
Took out rstrip() calls that are no longer neeeded
Diffstat (limited to 'cmd2')
-rw-r--r--cmd2/cmd2.py4
-rw-r--r--cmd2/history.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd2/cmd2.py b/cmd2/cmd2.py
index 28a9dedb..6c4fdcbd 100644
--- a/cmd2/cmd2.py
+++ b/cmd2/cmd2.py
@@ -3358,7 +3358,7 @@ class Cmd(cmd.Cmd):
with os.fdopen(fd, 'w') as fobj:
for command in history:
if command.statement.multiline_command:
- fobj.write('{}\n'.format(command.expanded.rstrip()))
+ fobj.write('{}\n'.format(command.expanded))
else:
fobj.write('{}\n'.format(command.raw))
try:
@@ -3372,7 +3372,7 @@ class Cmd(cmd.Cmd):
with open(os.path.expanduser(args.output_file), 'w') as fobj:
for item in history:
if item.statement.multiline_command:
- fobj.write('{}\n'.format(item.expanded.rstrip()))
+ fobj.write('{}\n'.format(item.expanded))
else:
fobj.write('{}\n'.format(item.raw))
plural = 's' if len(history) > 1 else ''
diff --git a/cmd2/history.py b/cmd2/history.py
index 576ac37d..3b18fbeb 100644
--- a/cmd2/history.py
+++ b/cmd2/history.py
@@ -45,14 +45,14 @@ class HistoryItem():
"""
if verbose:
raw = self.raw.rstrip()
- expanded = self.expanded.rstrip()
+ expanded = self.expanded
ret_str = self._listformat.format(self.idx, raw)
if raw != expanded:
ret_str += '\n' + self._ex_listformat.format(self.idx, expanded)
else:
if expanded:
- ret_str = self.expanded.rstrip()
+ ret_str = self.expanded
else:
ret_str = self.raw.rstrip()