Merged revisions 83380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83380 | r.david.murray | 2010-07-31 23:31:09 -0400 (Sat, 31 Jul 2010) | 17 lines
#8620: Cmd no longer truncates last character if stdin ends without newline
Cmd used to blindly chop off the last character of every input line. If
the input reached EOF and there was no final new line, it would truncate
the last character of the last command. This fix instead strips trailing
\r\n from the input lines. While this is a small behavior change, it
should not break any working code, since feeding a '\r\n' terminated
file to Cmd would previously leave the \r's on the lines, resulting
in failed command execution.
I wrote the unit test in preparation for a PyOhio TeachMe session
run by Catherine Devlin, and we can thank Catherine and the PyOhio
session attendees for the fix. I've added Catherine to the Acks file
for organizing and leading the TeachMe session, out of which we will
hopefully get some new contributors.
........
diff --git a/Lib/cmd.py b/Lib/cmd.py
index 6f34e04..10aa5ac 100644
--- a/Lib/cmd.py
+++ b/Lib/cmd.py
@@ -134,7 +134,7 @@
if not len(line):
line = 'EOF'
else:
- line = line[:-1] # chop \n
+ line = line.rstrip('\r\n')
line = self.precmd(line)
stop = self.onecmd(line)
stop = self.postcmd(stop, line)
diff --git a/Lib/test/test_cmd.py b/Lib/test/test_cmd.py
index e2b3022..7a13d27 100644
--- a/Lib/test/test_cmd.py
+++ b/Lib/test/test_cmd.py
@@ -9,7 +9,8 @@
import sys
import trace
import re
-from io import StringIO
+import unittest
+import io
class samplecmdclass(cmd.Cmd):
"""
@@ -166,9 +167,33 @@
def do_exit(self, arg):
return True
+
+class TestAlternateInput(unittest.TestCase):
+
+ class simplecmd(cmd.Cmd):
+
+ def do_print(self, args):
+ print(args, file=self.stdout)
+
+ def do_EOF(self, args):
+ return True
+
+ def test_file_with_missing_final_nl(self):
+ input = io.StringIO("print test\nprint test2")
+ output = io.StringIO()
+ cmd = self.simplecmd(stdin=input, stdout=output)
+ cmd.use_rawinput = False
+ cmd.cmdloop()
+ self.assertMultiLineEqual(output.getvalue(),
+ ("(Cmd) test\n"
+ "(Cmd) test2\n"
+ "(Cmd) "))
+
+
def test_main(verbose=None):
from test import support, test_cmd
support.run_doctest(test_cmd, verbose)
+ support.run_unittest(TestAlternateInput)
def test_coverage(coverdir):
tracer=trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,],
diff --git a/Misc/ACKS b/Misc/ACKS
index a9f7885..519dda4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -179,6 +179,7 @@
Arnaud Delobelle
Erik Demaine
Roger Dev
+Catherine Devlin
Raghuram Devarakonda
Toby Dickenson
Mark Dickinson
diff --git a/Misc/NEWS b/Misc/NEWS
index 9505191..8d665db 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -78,6 +78,9 @@
Library
-------
+- Issue #8620: when a Cmd is fed input that reaches EOF without a final
+ newline, it no longer truncates the last character of the last command line.
+
- Issue #3704: http.cookiejar was not properly handling URLs with a / in the
parameters.