[Python-checkins] r80906 - in python/branches/release31-maint: Lib/test/regrtest.py

[victor.stinner]

Author: victor.stinner
Date: Fri May  7 02:58:26 2010
New Revision: 80906

Log:
Merged revisions 80905 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r80905 | victor.stinner | 2010-05-07 02:57:12 +0200 (ven., 07 mai 2010) | 4 lines
  
  regrtest.py: disable replace_stdout() on Windows until it is fixed
  
  See issue #8533 (problem with newlines on Windows).
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/regrtest.py

Modified: python/branches/release31-maint/Lib/test/regrtest.py
==============================================================================
--- python/branches/release31-maint/Lib/test/regrtest.py	(original)
+++ python/branches/release31-maint/Lib/test/regrtest.py	Fri May  7 02:58:26 2010
@@ -560,6 +560,9 @@
 def replace_stdout():
     """Set stdout encoder error handler to backslashreplace (as stderr error
     handler) to avoid UnicodeEncodeError when printing a traceback"""
+    if os.name == "nt":
+        # Replace sys.stdout breaks the stdout newlines on Windows: issue #8533
+        return
     stdout = sys.stdout
     sys.stdout = open(stdout.fileno(), 'w',
         encoding=stdout.encoding,