From: Anthony Baxter <anthonybaxter@gmail.com>
Date: Thu, 10 Jan 2002 15:51:52 +0000 (+0000)
Subject: backport 1.14:
X-Git-Tag: v2.1.2c1~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=770139cac81083ad8174c64b7024a47f73a235d9;p=thirdparty%2FPython%2Fcpython.git

backport 1.14:
  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.

This makes test_pty work on Irix.
---

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index b119f6275fa1..5ea36008e0b4 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)