From dc795b82aaa6943e1760ec34515d5dd82a57c4ca Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 11 Sep 2001 14:24:35 +0000 Subject: [PATCH] Fix the second reincarnation of SF #456395 -- failure on IRIX. This time use .replace() to change all \r\n into \n, not just the last one. --- Lib/test/test_pty.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py index 7d72b763efa..204ff56922a 100644 --- a/Lib/test/test_pty.py +++ b/Lib/test/test_pty.py @@ -34,17 +34,13 @@ if not os.isatty(slave_fd): debug("Writing to slave_fd") os.write(slave_fd, TEST_STRING_1) s1 = os.read(master_fd, 1024) -if s1[-2:] == "\r\n": - s1 = s1[:-2] + "\n" -sys.stdout.write(s1) +sys.stdout.write(s1.replace("\r\n", "\n")) debug("Writing chunked output") os.write(slave_fd, TEST_STRING_2[:5]) os.write(slave_fd, TEST_STRING_2[5:]) s2 = os.read(master_fd, 1024) -if s2[-2:] == "\r\n": - s2 = s2[:-2] + "\n" -sys.stdout.write(s2) +sys.stdout.write(s2.replace("\r\n", "\n")) os.close(slave_fd) os.close(master_fd)