[Python-checkins] r45725 - python/trunk/Lib/test/test_pty.py

Wed Apr 26 08:26:14 CEST 2006

Author: neal.norwitz
Date: Wed Apr 26 08:26:12 2006
New Revision: 45725
Modified:
 python/trunk/Lib/test/test_pty.py
Log:
Fix this test on Solaris. There can be embedded \r, so don't just replace
the one at the end.
Modified: python/trunk/Lib/test/test_pty.py
==============================================================================

--- python/trunk/Lib/test/test_pty.py	(original)
+++ python/trunk/Lib/test/test_pty.py	Wed Apr 26 08:26:12 2006
@@ -24,11 +24,11 @@
 
 # OSF/1 (Tru64) apparently turns \n into \r\r\n.
 if data.endswith('\r\r\n'):
- return data[:-3] + '\n'
+ return data.replace('\r\r\n', '\n')
 
 # IRIX apparently turns \n into \r\n.
 if data.endswith('\r\n'):
- return data[:-2] + '\n'
+ return data.replace('\r\n', '\n')
 
 return data
 
