From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 7 May 2010 00:58:26 +0000 (+0000)
Subject: Merged revisions 80905 via svnmerge from
X-Git-Tag: v3.1.3rc1~799
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37d263521203b6f031e8554b47dbf8ac5c2a5cb2;p=python

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).
........
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 5eea1d996c..30792c2f66 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -560,6 +560,9 @@ def findtests(testdir=None, stdtests=STDTESTS, nottests=NOTTESTS):
 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,