From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 19 May 2010 17:11:19 +0000 (+0000)
Subject: regrtest.py: call replace_stdout() before the first call to print()
X-Git-Tag: v3.2a1~745
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1802d3f3888b374b8d44470156a98081697a6280;p=thirdparty%2FPython%2Fcpython.git

regrtest.py: call replace_stdout() before the first call to print()

print("==  ", os.getcwd()) fails if the current working directory is not ASCII
whereas sys.stdout encoding is ASCII.
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 00ea0d62b18a..34b743e33f47 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -258,6 +258,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
     on the command line.
     """
 
+    replace_stdout()
+
     support.record_original_stdout(sys.stdout)
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:nj:',
@@ -376,7 +378,6 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
         elif o in ('-j', '--multiprocess'):
             use_mp = int(a)
         elif o == '--slaveargs':
-            replace_stdout()
             args, kwargs = json.loads(a)
             try:
                 result = runtest(*args, **kwargs)
@@ -515,8 +516,6 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
     else:
         tests = iter(selected)
 
-    replace_stdout()
-
     if use_mp:
         try:
             from threading import Thread